--- rxvt-unicode/src/rxvtperl.xs 2006/01/20 12:16:28 1.80 +++ rxvt-unicode/src/rxvtperl.xs 2006/01/26 00:09:47 1.94 @@ -246,15 +246,17 @@ #define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") -struct overlay { - HV *self; - bool visible; +class overlay { rxvt_term *THIS; + AV *overlay_av; int x, y, w, h; int border; text_t **text; rend_t **rend; +public: + HV *self; + overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); ~overlay (); @@ -267,7 +269,7 @@ }; 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), visible(false) +: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) { if (border == 2) { @@ -316,7 +318,6 @@ } show (); - THIS->want_refresh = 1; } overlay::~overlay () @@ -331,45 +332,46 @@ delete [] text; delete [] rend; - - THIS->want_refresh = 1; } void overlay::show () { - if (visible) + if (overlay_av) return; - visible = true; + overlay_av = (AV *)SvREFCNT_inc (SvRV ( + *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) + )); + av_push (overlay_av, newSViv ((long)this)); - AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)); - av_push (av, newSViv ((long)this)); + THIS->want_refresh = 1; } void overlay::hide () { - if (!visible) + if (!overlay_av) 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) + for (i = AvFILL (overlay_av); i >= 0; i--) + if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this) { - av_delete (av, i, G_DISCARD); + av_delete (overlay_av, i, G_DISCARD); break; } - for (; i < AvFILL (av); i++) - av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); + for (; i < AvFILL (overlay_av); i++) + av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0))); - av_pop (av); + av_pop (overlay_av); + + SvREFCNT_dec (overlay_av); + overlay_av = 0; + + THIS->want_refresh = 1; } void overlay::swap () @@ -556,7 +558,7 @@ case DT_STR_LEN: { char *str = va_arg (ap, char *); - int len = va_arg (ap, int); + int len = va_arg (ap, int); XPUSHs (sv_2mortal (newSVpvn (str, len))); } @@ -565,21 +567,30 @@ case DT_WCS_LEN: { wchar_t *wstr = va_arg (ap, wchar_t *); - int wlen = va_arg (ap, int); + int wlen = va_arg (ap, int); XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); } break; + case DT_LCS_LEN: + { + long *lstr = va_arg (ap, long *); + int llen = va_arg (ap, int); + + XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); + } + 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 +# 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); @@ -598,7 +609,7 @@ setuv (time, xe->xmotion.time); setiv (x, xe->xmotion.x); setiv (y, xe->xmotion.y); - setiv (row, xe->xmotion.y / term->fheight); + 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); @@ -642,6 +653,13 @@ 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); @@ -651,6 +669,7 @@ 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))); @@ -710,6 +729,9 @@ { clearSVptr ((SV *)term->perl.self); SvREFCNT_dec ((SV *)term->perl.self); + + // don't allow further calls + term->perl.self = 0; } swap (perl_environ, environ); @@ -836,6 +858,31 @@ const_iv (ColormapNotify), const_iv (ClientMessage), const_iv (MappingNotify), +# if ENABLE_XIM_ONTHESPOT + const_iv (XIMReverse), + const_iv (XIMUnderline), + const_iv (XIMHighlight), + const_iv (XIMPrimary), + const_iv (XIMSecondary), + const_iv (XIMTertiary), + const_iv (XIMVisibleToForward), + const_iv (XIMVisibleToBackword), + const_iv (XIMVisibleToCenter), +# if 0 + const_iv (XIMForwardChar), + const_iv (XIMBackwardChar), + const_iv (XIMForwardWord), + const_iv (XIMBackwardWord), + const_iv (XIMCaretUp), + const_iv (XIMCaretDown), + const_iv (XIMNextLine), + const_iv (XIMPreviousLine), + const_iv (XIMLineStart), + const_iv (XIMLineEnd), + const_iv (XIMAbsolutePosition), + const_iv (XIMDontChange), +# endif +# endif }; for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); @@ -922,23 +969,23 @@ rxvt_term *term = new rxvt_term; - term->argv = new stringvec; - term->envv = new stringvec; + stringvec *argv = new stringvec; + stringvec *envv = new stringvec; for (int i = 1; i < items; i++) - term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); + argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); - AV *envv = (AV *)SvRV (ST (0)); - for (int i = AvFILL (envv) + 1; i--; ) - term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); + AV *env = (AV *)SvRV (ST (0)); + for (int i = AvFILL (env) + 1; i--; ) + envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); - term->envv->push_back (0); + envv->push_back (0); bool success; try { - success = term->init (term->argv->size (), term->argv->begin ()); + success = term->init (argv, envv); } catch (const class rxvt_failure_exception &e) { @@ -1111,12 +1158,16 @@ ModLevel3Mask = 0 ModMetaMask = 1 ModNumLockMask = 2 + current_screen = 3 + hidden_cursor = 4 CODE: switch (ix) { - case 0: RETVAL = THIS->ModLevel3Mask; break; - case 1: RETVAL = THIS->ModMetaMask; break; - case 2: RETVAL = THIS->ModNumLockMask; break; + 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 @@ -1164,6 +1215,13 @@ OUTPUT: RETVAL +int +rxvt_term::pty_fd () + CODE: + RETVAL = THIS->pty->pty; + OUTPUT: + RETVAL + Window rxvt_term::parent () CODE: @@ -1206,6 +1264,12 @@ RETVAL void +rxvt_term::focus_in () + +void +rxvt_term::focus_out () + +void rxvt_term::want_refresh () CODE: THIS->want_refresh = 1; @@ -1221,14 +1285,12 @@ if (GIMME_V != G_VOID) { - wchar_t *wstr = new wchar_t [THIS->ncol]; + wchar_t *wstr = rxvt_temp_buf (THIS->ncol); for (int col = 0; col < THIS->ncol; col++) wstr [col] = l.t [col]; XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); - - delete [] wstr; } if (new_text) @@ -1237,7 +1299,7 @@ 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"); @@ -1281,7 +1343,7 @@ AV *av = (AV *)SvRV (new_rend); 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++) @@ -1331,35 +1393,41 @@ { wchar_t *wstr = sv2wcs (string); int wlen = wcslen (wstr); - wchar_t *rstr = new wchar_t [wlen]; // cannot become longer + wchar_t *rstr = rxvt_temp_buf (wlen * 2); // 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"); + { + int w = WCWIDTH (*s); + + if (w == 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); + unicode_t n = rxvt_compose (r[-1], *s); + if (n == NOCHAR) + n = rxvt_composite.compose (r[-1], *s); - r[-1] = n; - } + r[-1] = n; + } #if !UNICODE_3 - else if (*s >= 0x10000) - *r++ = rxvt_composite.compose (*s); + else if (*s >= 0x10000) + *r++ = rxvt_composite.compose (*s); #endif - else - *r++ = *s; + else + *r++ = *s; + + // the *2 above only allows wcwidth <= 2 + if (w > 1) + *r++ = NOCHAR; + } rxvt_pop_locale (); RETVAL = wcs2sv (rstr, r - rstr); - - delete [] rstr; } OUTPUT: RETVAL @@ -1381,7 +1449,7 @@ else dlen++; - wchar_t *rstr = new wchar_t [dlen]; + wchar_t *rstr = rxvt_temp_buf (dlen); // decode wchar_t *r = rstr; @@ -1394,8 +1462,6 @@ *r++ = *s; RETVAL = wcs2sv (rstr, r - rstr); - - delete [] rstr; } OUTPUT: RETVAL @@ -1515,10 +1581,20 @@ rc.row = SvIV (ST (1)); rc.col = SvIV (ST (2)); - if (ix == 2 && rc.col == 0) + if (ix == 2) { - rc.row--; - rc.col = THIS->ncol; + 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); @@ -1536,8 +1612,8 @@ OUTPUT: RETVAL -#void -#rxvt_term::selection_clear () +void +rxvt_term::selection_clear () void rxvt_term::selection_make (Time eventtime, bool rect = false) @@ -1577,6 +1653,9 @@ rxvt_term::scr_bell () void +rxvt_term::scr_change_screen (int screen) + +void rxvt_term::scr_add_lines (SV *string) CODE: { @@ -1652,15 +1731,21 @@ unsigned long nitems; unsigned long bytes_after; unsigned char *prop; + XGetWindowProperty (THIS->display->display, window, property, - 0, 1<<30, 0, AnyPropertyType, + 0, 1<<24, 0, AnyPropertyType, &type, &format, &nitems, &bytes_after, &prop); + if (type != None) { + 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 * format / 8)); + PUSHs (newSVpvn ((char *)prop, nitems * elemsize)); XFree (prop); } } @@ -1672,11 +1757,26 @@ 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 * 8 / format); + (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 @@ -1688,6 +1788,8 @@ OUTPUT: RETVAL +#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, @@ -1695,6 +1797,8 @@ 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 @@ -1709,7 +1813,32 @@ void XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) - C_ARGS: term->display->display, (Window)window, x, y, width, 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