--- rxvt-unicode/src/rxvtperl.xs 2006/01/12 00:35:39 1.56 +++ rxvt-unicode/src/rxvtperl.xs 2006/01/16 15:00:20 1.69 @@ -31,6 +31,8 @@ #include #include +#include "unistd.h" + #include "iom.h" #include "rxvt.h" #include "keyboard.h" @@ -39,7 +41,7 @@ #include "perlxsi.c" -#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) +#ifdef HAVE_SCROLLBARS # define GRAB_CURSOR THIS->leftptr_cursor #else # define GRAB_CURSOR None @@ -50,6 +52,8 @@ #undef ROW #define ROW(n) THIS->row_buf [LINENO (n)] +#define ENABLE_PERL_FRILLS 1 + ///////////////////////////////////////////////////////////////////////////// static SV * @@ -347,8 +351,8 @@ 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--; ) { @@ -395,10 +399,6 @@ static PerlInterpreter *perl; -rxvt_perl_interp::rxvt_perl_interp () -{ -} - rxvt_perl_interp::~rxvt_perl_interp () { if (perl) @@ -409,11 +409,14 @@ } void -rxvt_perl_interp::init () +rxvt_perl_interp::init (rxvt_term *term) { if (!perl) { - temp_environ temp_environ(rxvt_environ); + rxvt_push_locale (""); // perl init destroys current locale + + perl_environ = rxvt_environ; + swap (perl_environ, environ); char *argv[] = { "", @@ -433,7 +436,15 @@ perl_free (perl); perl = 0; } + + swap (perl_environ, environ); + + rxvt_pop_locale (); } + + // 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 *)newHV ()), 0); } static void @@ -447,182 +458,191 @@ } } -bool -rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) +static void +swap_overlays (rxvt_term *term) { - if (!perl) - return false; + HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); - if (htype == HOOK_INIT) // first hook ever called - { - 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 (HvKEYS (hv)) { - if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) - { - 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 (); - } - - } + hv_iterinit (hv); - if (!should_invoke [htype]) - return false; + while (HE *he = hv_iternext (hv)) + ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); } +} - temp_environ temp_environ(rxvt_environ); - - dSP; - va_list ap; - - va_start (ap, htype); - - ENTER; - SAVETMPS; +bool +rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) +{ + if (!perl || !term->perl.self) + return false; - PUSHMARK (SP); + // pre-handling of some events + if (htype == HOOK_REFRESH_END) + swap_overlays (term); - XPUSHs (sv_2mortal (newSVterm (term))); - XPUSHs (sv_2mortal (newSViv (htype))); + swap (perl_environ, environ); - for (;;) { - data_type dt = (data_type)va_arg (ap, int); + bool event_consumed; - switch (dt) + if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always + || term->perl.should_invoke [htype]) + try { - 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 (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); - break; + dSP; + va_list ap; - case DT_STR_LEN: - { - char *str = va_arg (ap, char *); - int len = va_arg (ap, int); + va_start (ap, htype); - XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); - } - break; + ENTER; + SAVETMPS; - case DT_WCS_LEN: - { - wchar_t *wstr = va_arg (ap, wchar_t *); - int wlen = va_arg (ap, int); + PUSHMARK (SP); - XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); - } - break; + XPUSHs (sv_2mortal (newSVterm (term))); + XPUSHs (sv_2mortal (newSViv (htype))); - case DT_XEVENT: - { - XEvent *xe = va_arg (ap, XEvent *); - HV *hv = newHV (); + for (;;) { + data_type dt = (data_type)va_arg (ap, int); + + 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 (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); + 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; - 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; - } + case DT_END: + goto call; - switch (xe->type) - { - case KeyPress: - case KeyRelease: - setiv (keycode, xe->xkey.keycode); - break; - - case ButtonPress: - case ButtonRelease: - setiv (button, xe->xbutton.button); - break; + default: + rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); + } + } - case MotionNotify: - setiv (is_hint, xe->xmotion.is_hint); - break; - } + call: + va_end (ap); - XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); - } - break; + PUTBACK; + int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL); + SPAGAIN; - case DT_END: + if (count) { - va_end (ap); - - PUTBACK; - int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL); - SPAGAIN; + SV *status = POPs; + count = SvTRUE (status); + } - if (count) - { - SV *status = POPs; - count = SvTRUE (status); - } + PUTBACK; + FREETMPS; + LEAVE; - PUTBACK; - FREETMPS; - LEAVE; + if (SvTRUE (ERRSV)) + { + rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); + ungrab (term); // better lose the grab than the session + } - if (SvTRUE (ERRSV)) - { - rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); - ungrab (term); // better lose the grab than the session - } + event_consumed = !!count; + } + catch (...) + { + swap (perl_environ, environ); + throw; + } + else + event_consumed = false; - if (htype == HOOK_DESTROY) - { - clearSVptr ((SV *)term->perl.self); - SvREFCNT_dec ((SV *)term->perl.self); - } + // post-handling of some events + if (htype == HOOK_REFRESH_BEGIN) + swap_overlays (term); + else if (htype == HOOK_DESTROY) + { + clearSVptr ((SV *)term->perl.self); + SvREFCNT_dec ((SV *)term->perl.self); + } - return count; - } + swap (perl_environ, environ); - default: - rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); - } - } + return event_consumed; } ///////////////////////////////////////////////////////////////////////////// @@ -651,42 +671,107 @@ # 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); + 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); @@ -704,6 +789,9 @@ OUTPUT: RETVAL +void +_exit (int status) + bool safe () CODE: @@ -815,6 +903,100 @@ void rxvt_term::destroy () +#if ENABLE_PERL_FRILLS + +void +rxvt_term::XListProperties (U32 window) + PPCODE: +{ + int count; + Atom *props = XListProperties (THIS->display->display, (Window)window, &count); + + EXTEND (SP, count); + while (count--) + PUSHs (newSVuv ((U32)props [count])); + + XFree (props); +} + +void +rxvt_term::XGetWindowProperty (U32 window, U32 property) + PPCODE: +{ + Atom type; + int format; + unsigned long nitems; + unsigned long bytes_after; + unsigned char *prop; + XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property, + 0, 1<<30, 0, AnyPropertyType, + &type, &format, &nitems, &bytes_after, &prop); + if (type != None) + { + EXTEND (SP, 3); + PUSHs (newSVuv ((U32)type)); + PUSHs (newSViv (format)); + PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); + XFree (prop); + } +} + +void +rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data) + CODE: +{ + STRLEN len; + char *data_ = SvPVbyte (data, len); + + XChangeProperty (THIS->display->display, (Window)window, (Atom)property, + type, format, PropModeReplace, + (unsigned char *)data, len * 8 / format); +} + +void +rxvt_term::XDeleteProperty (U32 window, U32 property) + CODE: + XDeleteProperty (THIS->display->display, (Window)window, (Atom)property); + +U32 +rxvt_term::DefaultRootWindow () + CODE: + RETVAL = (U32)THIS->display->root; + OUTPUT: + RETVAL + +U32 +rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height) + CODE: + RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent, + x, y, width, height, 0, + THIS->pix_colors_focused[Color_border], + THIS->pix_colors_focused[Color_border]); + OUTPUT: + RETVAL + +void +rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0) + CODE: + XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y); + +void +rxvt_term::XMapWindow (U32 window) + CODE: + XMapWindow (THIS->display->display, (Window)window); + +void +rxvt_term::XUnmapWindow (U32 window) + CODE: + XUnmapWindow (THIS->display->display, (Window)window); + +#endif + +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: @@ -927,7 +1109,7 @@ #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) +#define TERM_OFFSET_top_row TERM_OFFSET(top_row) int rxvt_term::width () @@ -943,7 +1125,7 @@ mapped = TERM_OFFSET_mapped saveLines = TERM_OFFSET_saveLines total_rows = TERM_OFFSET_total_rows - nsaved = TERM_OFFSET_nsaved + top_row = TERM_OFFSET_top_row CODE: RETVAL = *(int *)((char *)THIS + ix); OUTPUT: @@ -1022,27 +1204,29 @@ 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) +rxvt_term::view_start (int newval = 1) + PROTOTYPE: $;$ CODE: { RETVAL = THIS->view_start; - if (newval >= 0) - { - THIS->view_start = min (newval, THIS->nsaved); - THIS->scr_changeview (RETVAL); - } + if (newval <= 0) + THIS->scr_changeview (max (newval, THIS->top_row)); } OUTPUT: RETVAL @@ -1056,7 +1240,7 @@ 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)) + if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -1099,7 +1283,7 @@ 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)) + if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -1139,7 +1323,7 @@ rxvt_term::ROW_l (int row_number, int new_length = -1) CODE: { - if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) + if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -1155,7 +1339,7 @@ rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1) CODE: { - if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) + if (!IN_RANGE_EXC (row_number, THIS->top_row, THIS->nrow)) XSRETURN_EMPTY; line_t &l = ROW(row_number); @@ -1355,7 +1539,7 @@ if (items == 3) { - rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); + rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); if (ix) @@ -1370,6 +1554,16 @@ OUTPUT: RETVAL +#void +#rxvt_term::selection_clear () + +void +rxvt_term::selection_make (U32 eventtime, bool rect = false) + CODE: + THIS->selection.op = SELECTION_CONT; + THIS->selection.rect = rect; + THIS->selection_make (eventtime); + int rxvt_term::selection_grab (U32 eventtime)