ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtperl.xs
(Generate patch)

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.83 by root, Fri Jan 20 15:40:39 2006 UTC vs.
Revision 1.101 by root, Wed Jul 5 23:34:14 2006 UTC

… …
80new_ref (HV *hv, const char *klass) 80new_ref (HV *hv, const char *klass)
81{ 81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83} 83}
84 84
85//TODO: use magic
86static SV * 85static SV *
87newSVptr (void *ptr, const char *klass) 86newSVptr (void *ptr, const char *klass)
88{ 87{
89 HV *hv = newHV (); 88 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
… …
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 112 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 113
115 return (long)mg->mg_ptr; 114 return (long)mg->mg_ptr;
116} 115}
117 116
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 117#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 118#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 119
121///////////////////////////////////////////////////////////////////////////// 120/////////////////////////////////////////////////////////////////////////////
122 121
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher") 122#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124 123
… …
171 170
172 if (SvTRUE (ERRSV)) 171 if (SvTRUE (ERRSV))
173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 172 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
174} 173}
175 174
176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 175#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer") 176#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR ((sv), "urxvt::timer")
178 177
179struct timer : perl_watcher, time_watcher 178struct timer : perl_watcher, time_watcher
180{ 179{
181 tstamp interval; 180 tstamp interval;
182 181
… …
192 191
193 invoke ("urxvt::timer", newSVtimer (this)); 192 invoke ("urxvt::timer", newSVtimer (this));
194 } 193 }
195}; 194};
196 195
197#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 196#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow") 197#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR ((sv), "urxvt::iow")
199 198
200struct iow : perl_watcher, io_watcher 199struct iow : perl_watcher, io_watcher
201{ 200{
202 iow () 201 iow ()
203 : io_watcher (this, &iow::execute) 202 : io_watcher (this, &iow::execute)
… …
208 { 207 {
209 invoke ("urxvt::iow", newSViow (this), revents); 208 invoke ("urxvt::iow", newSViow (this), revents);
210 } 209 }
211}; 210};
212 211
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw") 212#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw") 213#define SvIW(sv) (iw *)(perl_watcher *)SvPTR ((sv), "urxvt::iw")
215 214
216struct iw : perl_watcher, idle_watcher 215struct iw : perl_watcher, idle_watcher
217{ 216{
218 iw () 217 iw ()
219 : idle_watcher (this, &iw::execute) 218 : idle_watcher (this, &iw::execute)
… …
224 { 223 {
225 invoke ("urxvt::iw", newSViw (this)); 224 invoke ("urxvt::iw", newSViw (this));
226 } 225 }
227}; 226};
228 227
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw") 228#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw") 229#define SvPW(sv) (pw *)(perl_watcher *)SvPTR ((sv), "urxvt::pw")
231 230
232struct pw : perl_watcher, child_watcher 231struct pw : perl_watcher, child_watcher
233{ 232{
234 pw () 233 pw ()
235 : child_watcher (this, &pw::execute) 234 : child_watcher (this, &pw::execute)
… …
244 243
245///////////////////////////////////////////////////////////////////////////// 244/////////////////////////////////////////////////////////////////////////////
246 245
247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 246#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
248 247
249struct overlay { 248class overlay {
250 HV *self;
251 bool visible;
252 rxvt_term *THIS; 249 rxvt_term *THIS;
250 AV *overlay_av;
253 int x, y, w, h; 251 int x, y, w, h;
254 int border; 252 int border;
255 text_t **text; 253 text_t **text;
256 rend_t **rend; 254 rend_t **rend;
257 255
256public:
257 HV *self;
258
258 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 259 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
259 ~overlay (); 260 ~overlay ();
260 261
261 void show (); 262 void show ();
262 void hide (); 263 void hide ();
… …
265 266
266 void set (int x, int y, SV *str, SV *rend); 267 void set (int x, int y, SV *str, SV *rend);
267}; 268};
268 269
269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 270overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
270: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false) 271: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
271{ 272{
272 if (border == 2) 273 if (border == 2)
273 { 274 {
274 w += 2; 275 w += 2;
275 h += 2; 276 h += 2;
… …
314 *rp++ = r; 315 *rp++ = r;
315 } 316 }
316 } 317 }
317 318
318 show (); 319 show ();
319 THIS->want_refresh = 1;
320} 320}
321 321
322overlay::~overlay () 322overlay::~overlay ()
323{ 323{
324 hide (); 324 hide ();
… …
329 delete [] rend[y]; 329 delete [] rend[y];
330 } 330 }
331 331
332 delete [] text; 332 delete [] text;
333 delete [] rend; 333 delete [] rend;
334}
335
336void
337overlay::show ()
338{
339 if (overlay_av)
340 return;
341
342 overlay_av = (AV *)SvREFCNT_inc (SvRV (
343 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
344 ));
345 av_push (overlay_av, newSViv ((long)this));
334 346
335 THIS->want_refresh = 1; 347 THIS->want_refresh = 1;
336} 348}
337 349
338void 350void
339overlay::show () 351overlay::hide ()
340{ 352{
341 if (visible) 353 if (!overlay_av)
342 return; 354 return;
343 355
344 visible = true;
345
346 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
347 av_push (av, newSViv ((long)this));
348}
349
350void
351overlay::hide ()
352{
353 if (!visible)
354 return;
355
356 visible = false;
357
358 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
359
360 int i; 356 int i;
361 357
362 for (i = AvFILL (av); i >= 0; i--) 358 for (i = AvFILL (overlay_av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this) 359 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
364 {
365 av_delete (av, i, G_DISCARD);
366 break; 360 break;
367 }
368 361
369 for (; i < AvFILL (av); i++) 362 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 363 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 364
372 av_pop (av); 365 av_pop (overlay_av);
366
367 SvREFCNT_dec (overlay_av);
368 overlay_av = 0;
369
370 THIS->want_refresh = 1;
373} 371}
374 372
375void overlay::swap () 373void overlay::swap ()
376{ 374{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 375 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
492static void 490static void
493ungrab (rxvt_term *THIS) 491ungrab (rxvt_term *THIS)
494{ 492{
495 if (THIS->perl.grabtime) 493 if (THIS->perl.grabtime)
496 { 494 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 495 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 496 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 497 THIS->perl.grabtime = 0;
500 } 498 }
501} 499}
502 500
503bool 501bool
… …
554 break; 552 break;
555 553
556 case DT_STR_LEN: 554 case DT_STR_LEN:
557 { 555 {
558 char *str = va_arg (ap, char *); 556 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 557 int len = va_arg (ap, int);
560 558
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 559 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 560 }
563 break; 561 break;
564 562
565 case DT_WCS_LEN: 563 case DT_WCS_LEN:
566 { 564 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 565 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 566 int wlen = va_arg (ap, int);
569 567
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 568 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
569 }
570 break;
571
572 case DT_LCS_LEN:
573 {
574 long *lstr = va_arg (ap, long *);
575 int llen = va_arg (ap, int);
576
577 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 578 }
572 break; 579 break;
573 580
574 case DT_XEVENT: 581 case DT_XEVENT:
575 { 582 {
576 XEvent *xe = va_arg (ap, XEvent *); 583 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 584 HV *hv = newHV ();
578 585
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 586# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
580# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 587# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
581# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 588# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 589# undef set
583 590
584 setiv (type, xe->type); 591 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 592 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 593 setiv (serial, xe->xany.serial);
587 594
… …
596 setuv (root, xe->xmotion.root); 603 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 604 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 605 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 606 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 607 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 608 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 609 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 610 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 611 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 612 setuv (state, xe->xmotion.state);
606 613
… …
640 break; 647 break;
641 } 648 }
642 649
643 break; 650 break;
644 651
652 case PropertyNotify:
653 setuv (window, xe->xproperty.window);
654 setuv (atom, xe->xproperty.atom);
655 setuv (time, xe->xproperty.time);
656 setiv (state, xe->xproperty.state);
657 break;
658
645 case ClientMessage: 659 case ClientMessage:
646 setuv (window, xe->xclient.window); 660 setuv (window, xe->xclient.window);
647 setuv (message_type, xe->xclient.message_type); 661 setuv (message_type, xe->xclient.message_type);
648 setuv (format, xe->xclient.format); 662 setuv (format, xe->xclient.format);
649 setuv (l0, xe->xclient.data.l[0]); 663 setuv (l0, xe->xclient.data.l[0]);
650 setuv (l1, xe->xclient.data.l[1]); 664 setuv (l1, xe->xclient.data.l[1]);
651 setuv (l2, xe->xclient.data.l[2]); 665 setuv (l2, xe->xclient.data.l[2]);
652 setuv (l3, xe->xclient.data.l[3]); 666 setuv (l3, xe->xclient.data.l[3]);
653 setuv (l4, xe->xclient.data.l[4]); 667 setuv (l4, xe->xclient.data.l[4]);
668 break;
654 } 669 }
655 670
656 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 671 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
657 } 672 }
658 break; 673 break;
… …
708 } 723 }
709 else if (htype == HOOK_DESTROY) 724 else if (htype == HOOK_DESTROY)
710 { 725 {
711 clearSVptr ((SV *)term->perl.self); 726 clearSVptr ((SV *)term->perl.self);
712 SvREFCNT_dec ((SV *)term->perl.self); 727 SvREFCNT_dec ((SV *)term->perl.self);
728
729 // don't allow further calls
730 term->perl.self = 0;
713 } 731 }
714 732
715 swap (perl_environ, environ); 733 swap (perl_environ, environ);
716 734
717 return event_consumed; 735 return event_consumed;
… …
741# include "optinc.h" 759# include "optinc.h"
742# undef nodef 760# undef nodef
743# undef def 761# undef def
744 762
745 HV *stash = gv_stashpv ("urxvt", 1); 763 HV *stash = gv_stashpv ("urxvt", 1);
746 struct { 764 static const struct {
747 const char *name; 765 const char *name;
748 IV iv; 766 IV iv;
749 } *civ, const_iv[] = { 767 } *civ, const_iv[] = {
750# define const_iv(name) { # name, (IV)name } 768# define const_iv(name) { # name, (IV)name }
751 const_iv (DEFAULT_RSTYLE), 769 const_iv (DEFAULT_RSTYLE),
… …
834 const_iv (SelectionRequest), 852 const_iv (SelectionRequest),
835 const_iv (SelectionNotify), 853 const_iv (SelectionNotify),
836 const_iv (ColormapNotify), 854 const_iv (ColormapNotify),
837 const_iv (ClientMessage), 855 const_iv (ClientMessage),
838 const_iv (MappingNotify), 856 const_iv (MappingNotify),
857# if ENABLE_XIM_ONTHESPOT
858 const_iv (XIMReverse),
859 const_iv (XIMUnderline),
860 const_iv (XIMHighlight),
861 const_iv (XIMPrimary),
862 const_iv (XIMSecondary),
863 const_iv (XIMTertiary),
864 const_iv (XIMVisibleToForward),
865 const_iv (XIMVisibleToBackword),
866 const_iv (XIMVisibleToCenter),
867# if 0
868 const_iv (XIMForwardChar),
869 const_iv (XIMBackwardChar),
870 const_iv (XIMForwardWord),
871 const_iv (XIMBackwardWord),
872 const_iv (XIMCaretUp),
873 const_iv (XIMCaretDown),
874 const_iv (XIMNextLine),
875 const_iv (XIMPreviousLine),
876 const_iv (XIMLineStart),
877 const_iv (XIMLineEnd),
878 const_iv (XIMAbsolutePosition),
879 const_iv (XIMDontChange),
880# endif
881# endif
839 }; 882 };
840 883
841 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 884 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
842 civ-- > const_iv; )
843 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 885 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
844} 886}
845 887
846void 888void
847warn (const char *msg) 889warn (const char *msg)
… …
878 RETVAL 920 RETVAL
879 921
880int 922int
881SET_FGCOLOR (int rend, int new_color) 923SET_FGCOLOR (int rend, int new_color)
882 CODE: 924 CODE:
883 RETVAL = SET_FGCOLOR (rend, new_color); 925 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
884 OUTPUT: 926 OUTPUT:
885 RETVAL 927 RETVAL
886 928
887int 929int
888SET_BGCOLOR (int rend, int new_color) 930SET_BGCOLOR (int rend, int new_color)
889 CODE: 931 CODE:
890 RETVAL = SET_BGCOLOR (rend, new_color); 932 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
891 OUTPUT: 933 OUTPUT:
892 RETVAL 934 RETVAL
893 935
894int 936int
895GET_CUSTOM (int rend) 937GET_CUSTOM (int rend)
… …
909 | ((new_value << RS_customShift) & RS_customMask); 951 | ((new_value << RS_customShift) & RS_customMask);
910} 952}
911 OUTPUT: 953 OUTPUT:
912 RETVAL 954 RETVAL
913 955
956void
957termlist ()
958 PPCODE:
959{
960 EXTEND (SP, rxvt_term::termlist.size ());
961
962 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
963 if ((*t)->perl.self)
964 PUSHs (sv_2mortal (newSVterm (*t)));
965}
966
914MODULE = urxvt PACKAGE = urxvt::term 967MODULE = urxvt PACKAGE = urxvt::term
915 968
916SV * 969SV *
917_new (...) 970_new (AV *env, AV *arg)
918 CODE: 971 CODE:
919{ 972{
920 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
921 croak ("first argument to urxvt::term->_new must be arrayref");
922
923 rxvt_term *term = new rxvt_term; 973 rxvt_term *term = new rxvt_term;
924 974
925 term->argv = new stringvec; 975 stringvec *argv = new stringvec;
926 term->envv = new stringvec; 976 stringvec *envv = new stringvec;
927 977
928 for (int i = 1; i < items; i++) 978 for (int i = 0; i <= AvFILL (arg); i++)
929 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 979 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
930 980
931 AV *envv = (AV *)SvRV (ST (0));
932 for (int i = AvFILL (envv) + 1; i--; ) 981 for (int i = AvFILL (env) + 1; i--; )
933 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 982 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
934 983
935 term->envv->push_back (0); 984 envv->push_back (0);
936 985
937 bool success; 986 bool success;
938 987
939 try 988 try
940 { 989 {
941 success = term->init (term->argv->size (), term->argv->begin ()); 990 success = term->init (argv, envv);
942 } 991 }
943 catch (const class rxvt_failure_exception &e) 992 catch (const class rxvt_failure_exception &e)
944 { 993 {
945 success = false; 994 success = false;
946 } 995 }
… …
964rxvt_term::set_should_invoke (int htype, int inc) 1013rxvt_term::set_should_invoke (int htype, int inc)
965 CODE: 1014 CODE:
966 THIS->perl.should_invoke [htype] += inc; 1015 THIS->perl.should_invoke [htype] += inc;
967 1016
968void 1017void
969rxvt_term::grab_button (int button, U32 modifiers) 1018rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
970 CODE: 1019 CODE:
971 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1020 XGrabButton (THIS->dpy, button, modifiers, window, 1,
972 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1021 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
973 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1022 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
974 1023
1024void
1025rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1026 CODE:
1027 XUngrabButton (THIS->dpy, button, modifiers, window);
1028
1029#if 0
1030
1031void
1032XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1033 C_ARGS:
1034 THIS->dpy, keycode, modifiers, window, 1,
1035 GrabModeSync, GrabModeSync
1036
1037void
1038XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1039 C_ARGS: THIS->dpy, keycode, modifiers, window
1040
1041#endif
1042
975bool 1043bool
976rxvt_term::grab (Time eventtime, int sync = 0) 1044rxvt_term::grab (Time eventtime, int sync = 0)
977 CODE: 1045 CODE:
978{ 1046{
979 int mode = sync ? GrabModeSync : GrabModeAsync; 1047 int mode = sync ? GrabModeSync : GrabModeAsync;
980 1048
981 THIS->perl.grabtime = 0; 1049 THIS->perl.grabtime = 0;
982 1050
983 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1051 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
984 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1052 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
985 mode, mode, None, GRAB_CURSOR, eventtime)) 1053 mode, mode, None, GRAB_CURSOR, eventtime))
986 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1054 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
987 THIS->perl.grabtime = eventtime; 1055 THIS->perl.grabtime = eventtime;
988 else 1056 else
989 XUngrabPointer (THIS->display->display, eventtime); 1057 XUngrabPointer (THIS->dpy, eventtime);
990 1058
991 RETVAL = !!THIS->perl.grabtime; 1059 RETVAL = !!THIS->perl.grabtime;
992} 1060}
993 OUTPUT: 1061 OUTPUT:
994 RETVAL 1062 RETVAL
995 1063
996void 1064void
997rxvt_term::allow_events_async () 1065rxvt_term::allow_events_async ()
998 CODE: 1066 CODE:
999 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1067 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1000 1068
1001void 1069void
1002rxvt_term::allow_events_sync () 1070rxvt_term::allow_events_sync ()
1003 CODE: 1071 CODE:
1004 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1072 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1005 1073
1006void 1074void
1007rxvt_term::allow_events_replay () 1075rxvt_term::allow_events_replay ()
1008 CODE: 1076 CODE:
1009 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1077 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1010 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1078 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1011 1079
1012void 1080void
1013rxvt_term::ungrab () 1081rxvt_term::ungrab ()
1014 CODE: 1082 CODE:
1015 ungrab (THIS); 1083 ungrab (THIS);
… …
1109rxvt_term::ModLevel3Mask () 1177rxvt_term::ModLevel3Mask ()
1110 ALIAS: 1178 ALIAS:
1111 ModLevel3Mask = 0 1179 ModLevel3Mask = 0
1112 ModMetaMask = 1 1180 ModMetaMask = 1
1113 ModNumLockMask = 2 1181 ModNumLockMask = 2
1182 current_screen = 3
1183 hidden_cursor = 4
1114 CODE: 1184 CODE:
1115 switch (ix) 1185 switch (ix)
1116 { 1186 {
1117 case 0: RETVAL = THIS->ModLevel3Mask; break; 1187 case 0: RETVAL = THIS->ModLevel3Mask; break;
1118 case 1: RETVAL = THIS->ModMetaMask; break; 1188 case 1: RETVAL = THIS->ModMetaMask; break;
1119 case 2: RETVAL = THIS->ModNumLockMask; break; 1189 case 2: RETVAL = THIS->ModNumLockMask; break;
1190 case 3: RETVAL = THIS->current_screen; break;
1191 case 4: RETVAL = THIS->hidden_cursor; break;
1120 } 1192 }
1121 OUTPUT: 1193 OUTPUT:
1122 RETVAL 1194 RETVAL
1123 1195
1124char * 1196char *
… …
1134 } 1206 }
1135 OUTPUT: 1207 OUTPUT:
1136 RETVAL 1208 RETVAL
1137 1209
1138SV * 1210SV *
1139rxvt_term::_env () 1211rxvt_term::envv ()
1212 ALIAS:
1213 argv = 1
1140 CODE: 1214 PPCODE:
1141{ 1215{
1142 if (THIS->envv) 1216 stringvec *vec = ix ? THIS->argv : THIS->envv;
1143 {
1144 AV *av = newAV ();
1145 1217
1218 EXTEND (SP, vec->size ());
1219
1146 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1220 for (char **i = vec->begin (); i != vec->end (); ++i)
1147 if (*i) 1221 if (*i)
1148 av_push (av, newSVpv (*i, 0)); 1222 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1149
1150 RETVAL = newRV_noinc ((SV *)av);
1151 }
1152 else
1153 RETVAL = &PL_sv_undef;
1154} 1223}
1155 OUTPUT:
1156 RETVAL
1157 1224
1158int 1225int
1159rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1226rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1160 CODE: 1227 CODE:
1161 RETVAL = THIS->pty_ev.events; 1228 RETVAL = THIS->pty_ev.events;
1162 if (events != EVENT_UNDEF) 1229 if (events != EVENT_UNDEF)
1163 THIS->pty_ev.set (events); 1230 THIS->pty_ev.set (events);
1164 OUTPUT: 1231 OUTPUT:
1165 RETVAL 1232 RETVAL
1166 1233
1234int
1235rxvt_term::pty_fd ()
1236 CODE:
1237 RETVAL = THIS->pty->pty;
1238 OUTPUT:
1239 RETVAL
1240
1167Window 1241Window
1168rxvt_term::parent () 1242rxvt_term::parent ()
1169 CODE: 1243 CODE:
1170 RETVAL = THIS->parent [0]; 1244 RETVAL = THIS->parent [0];
1171 OUTPUT: 1245 OUTPUT:
… …
1210 1284
1211void 1285void
1212rxvt_term::focus_out () 1286rxvt_term::focus_out ()
1213 1287
1214void 1288void
1289rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1290 ALIAS:
1291 key_release = 1
1292 CODE:
1293{
1294 XKeyEvent xkey;
1295
1296 memset (&xkey, 0, sizeof (xkey));
1297
1298 xkey.time = time;
1299 xkey.state = state;
1300 xkey.keycode = keycode;
1301
1302 xkey.type = ix ? KeyRelease : KeyPress;
1303 xkey.display = THIS->dpy;
1304 xkey.window = THIS->vt;
1305 xkey.root = THIS->display->root;
1306 xkey.subwindow = THIS->vt;
1307
1308 if (ix)
1309 THIS->key_release (xkey);
1310 else
1311 THIS->key_press (xkey);
1312}
1313
1314void
1215rxvt_term::want_refresh () 1315rxvt_term::want_refresh ()
1216 CODE: 1316 CODE:
1217 THIS->want_refresh = 1; 1317 THIS->want_refresh = 1;
1218 1318
1219void 1319void
… …
1225 1325
1226 line_t &l = ROW(row_number); 1326 line_t &l = ROW(row_number);
1227 1327
1228 if (GIMME_V != G_VOID) 1328 if (GIMME_V != G_VOID)
1229 { 1329 {
1230 wchar_t *wstr = new wchar_t [THIS->ncol]; 1330 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1231 1331
1232 for (int col = 0; col < THIS->ncol; col++) 1332 for (int col = 0; col < THIS->ncol; col++)
1233 wstr [col] = l.t [col]; 1333 wstr [col] = l.t [col];
1234 1334
1235 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1335 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1236
1237 delete [] wstr;
1238 } 1336 }
1239 1337
1240 if (new_text) 1338 if (new_text)
1241 { 1339 {
1242 wchar_t *wstr = sv2wcs (new_text); 1340 wchar_t *wstr = sv2wcs (new_text);
… …
1335rxvt_term::special_encode (SV *string) 1433rxvt_term::special_encode (SV *string)
1336 CODE: 1434 CODE:
1337{ 1435{
1338 wchar_t *wstr = sv2wcs (string); 1436 wchar_t *wstr = sv2wcs (string);
1339 int wlen = wcslen (wstr); 1437 int wlen = wcslen (wstr);
1340 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1438 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1341 1439
1342 rxvt_push_locale (THIS->locale); 1440 rxvt_push_locale (THIS->locale);
1343 1441
1344 wchar_t *r = rstr; 1442 wchar_t *r = rstr;
1345 for (wchar_t *s = wstr; *s; s++) 1443 for (wchar_t *s = wstr; *s; s++)
1444 {
1445 int w = WCWIDTH (*s);
1446
1346 if (wcwidth (*s) == 0) 1447 if (w == 0)
1347 { 1448 {
1348 if (r == rstr) 1449 if (r == rstr)
1349 croak ("leading combining character unencodable"); 1450 croak ("leading combining character unencodable");
1350 1451
1351 unicode_t n = rxvt_compose (r[-1], *s); 1452 unicode_t n = rxvt_compose (r[-1], *s);
1352 if (n == NOCHAR) 1453 if (n == NOCHAR)
1353 n = rxvt_composite.compose (r[-1], *s); 1454 n = rxvt_composite.compose (r[-1], *s);
1354 1455
1355 r[-1] = n; 1456 r[-1] = n;
1356 } 1457 }
1357#if !UNICODE_3 1458#if !UNICODE_3
1358 else if (*s >= 0x10000) 1459 else if (*s >= 0x10000)
1359 *r++ = rxvt_composite.compose (*s); 1460 *r++ = rxvt_composite.compose (*s);
1360#endif 1461#endif
1361 else 1462 else
1362 *r++ = *s; 1463 *r++ = *s;
1464
1465 // the *2 above only allows wcwidth <= 2
1466 if (w > 1)
1467 *r++ = NOCHAR;
1468 }
1363 1469
1364 rxvt_pop_locale (); 1470 rxvt_pop_locale ();
1365 1471
1366 RETVAL = wcs2sv (rstr, r - rstr); 1472 RETVAL = wcs2sv (rstr, r - rstr);
1367
1368 delete [] rstr;
1369} 1473}
1370 OUTPUT: 1474 OUTPUT:
1371 RETVAL 1475 RETVAL
1372 1476
1373SV * 1477SV *
… …
1385 else if (IS_COMPOSE (*s)) 1489 else if (IS_COMPOSE (*s))
1386 dlen += rxvt_composite.expand (*s, 0); 1490 dlen += rxvt_composite.expand (*s, 0);
1387 else 1491 else
1388 dlen++; 1492 dlen++;
1389 1493
1390 wchar_t *rstr = new wchar_t [dlen]; 1494 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1391 1495
1392 // decode 1496 // decode
1393 wchar_t *r = rstr; 1497 wchar_t *r = rstr;
1394 for (wchar_t *s = wstr; *s; s++) 1498 for (wchar_t *s = wstr; *s; s++)
1395 if (*s == NOCHAR) 1499 if (*s == NOCHAR)
… …
1398 r += rxvt_composite.expand (*s, r); 1502 r += rxvt_composite.expand (*s, r);
1399 else 1503 else
1400 *r++ = *s; 1504 *r++ = *s;
1401 1505
1402 RETVAL = wcs2sv (rstr, r - rstr); 1506 RETVAL = wcs2sv (rstr, r - rstr);
1403
1404 delete [] rstr;
1405} 1507}
1406 OUTPUT: 1508 OUTPUT:
1407 RETVAL 1509 RETVAL
1408 1510
1409void 1511void
1410rxvt_term::_resource (char *name, int index, SV *newval = 0) 1512rxvt_term::_resource (char *name, int index, SV *newval = 0)
1411 PPCODE: 1513 PPCODE:
1412{ 1514{
1413 struct resval { const char *name; int value; } rslist [] = { 1515 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1414# define def(name) { # name, Rs_ ## name }, 1516# define def(name) { # name, Rs_ ## name },
1415# define reserve(name,count) 1517# define reserve(name,count)
1416# include "rsinc.h" 1518# include "rsinc.h"
1417# undef def 1519# undef def
1418# undef reserve 1520# undef reserve
1419 }; 1521 };
1420 1522
1421 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1523 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1422 1524
1423 do { 1525 do {
1424 if (rs-- == rslist) 1526 if (rs-- == rslist)
1425 croak ("no such resource '%s', requested", name); 1527 croak ("no such resource '%s', requested", name);
1426 } while (strcmp (name, rs->name)); 1528 } while (strcmp (name, rs->name));
… …
1519 if (items == 3) 1621 if (items == 3)
1520 { 1622 {
1521 rc.row = SvIV (ST (1)); 1623 rc.row = SvIV (ST (1));
1522 rc.col = SvIV (ST (2)); 1624 rc.col = SvIV (ST (2));
1523 1625
1524 if (ix == 2 && rc.col == 0) 1626 if (ix == 2)
1525 { 1627 {
1628 if (rc.col == 0)
1629 {
1630 // col == 0 means end of previous line
1526 rc.row--; 1631 rc.row--;
1527 rc.col = THIS->ncol; 1632 rc.col = THIS->ncol;
1633 }
1634 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1635 && rc.col > ROW(rc.row).l)
1636 {
1637 // col >= length means while line and add newline
1638 rc.col = THIS->ncol;
1639 }
1528 } 1640 }
1529 1641
1530 clamp_it (rc.col, 0, THIS->ncol); 1642 clamp_it (rc.col, 0, THIS->ncol);
1531 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1643 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1532 1644
… …
1540 CODE: 1652 CODE:
1541 RETVAL = THIS->charsets [THIS->screen.charset]; 1653 RETVAL = THIS->charsets [THIS->screen.charset];
1542 OUTPUT: 1654 OUTPUT:
1543 RETVAL 1655 RETVAL
1544 1656
1545#void 1657void
1546#rxvt_term::selection_clear () 1658rxvt_term::selection_clear ()
1547 1659
1548void 1660void
1549rxvt_term::selection_make (Time eventtime, bool rect = false) 1661rxvt_term::selection_make (Time eventtime, bool rect = false)
1550 CODE: 1662 CODE:
1551 THIS->selection.op = SELECTION_CONT; 1663 THIS->selection.op = SELECTION_CONT;
… …
1579void 1691void
1580rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1692rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1581 1693
1582void 1694void
1583rxvt_term::scr_bell () 1695rxvt_term::scr_bell ()
1696
1697void
1698rxvt_term::scr_change_screen (int screen)
1584 1699
1585void 1700void
1586rxvt_term::scr_add_lines (SV *string) 1701rxvt_term::scr_add_lines (SV *string)
1587 CODE: 1702 CODE:
1588{ 1703{
… …
1638void 1753void
1639rxvt_term::XListProperties (Window window) 1754rxvt_term::XListProperties (Window window)
1640 PPCODE: 1755 PPCODE:
1641{ 1756{
1642 int count; 1757 int count;
1643 Atom *props = XListProperties (THIS->display->display, window, &count); 1758 Atom *props = XListProperties (THIS->dpy, window, &count);
1644 1759
1645 EXTEND (SP, count); 1760 EXTEND (SP, count);
1646 while (count--) 1761 while (count--)
1647 PUSHs (newSVuv ((U32)props [count])); 1762 PUSHs (newSVuv ((U32)props [count]));
1648 1763
… …
1657 int format; 1772 int format;
1658 unsigned long nitems; 1773 unsigned long nitems;
1659 unsigned long bytes_after; 1774 unsigned long bytes_after;
1660 unsigned char *prop; 1775 unsigned char *prop;
1661 1776
1662 XGetWindowProperty (THIS->display->display, window, property, 1777 XGetWindowProperty (THIS->dpy, window, property,
1663 0, 1<<24, 0, AnyPropertyType, 1778 0, 1<<24, 0, AnyPropertyType,
1664 &type, &format, &nitems, &bytes_after, &prop); 1779 &type, &format, &nitems, &bytes_after, &prop);
1665 1780
1666 if (type != None) 1781 if (type != None)
1667 { 1782 {
… …
1686 1801
1687 int elemsize = format == 16 ? sizeof (short) 1802 int elemsize = format == 16 ? sizeof (short)
1688 : format == 32 ? sizeof (long) 1803 : format == 32 ? sizeof (long)
1689 : 1; 1804 : 1;
1690 1805
1691 XChangeProperty (THIS->display->display, window, property, 1806 XChangeProperty (THIS->dpy, window, property,
1692 type, format, PropModeReplace, 1807 type, format, PropModeReplace,
1693 (unsigned char *)data_, len / elemsize); 1808 (unsigned char *)data_, len / elemsize);
1694 XSync (THIS->display->display, 0);
1695} 1809}
1696 1810
1697Atom 1811Atom
1698XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE) 1812XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1699 C_ARGS: term->display->display, atom_name, only_if_exists 1813 C_ARGS: term->dpy, atom_name, only_if_exists
1700 1814
1701char * 1815char *
1702XGetAtomName (rxvt_term *term, Atom atom) 1816XGetAtomName (rxvt_term *term, Atom atom)
1703 C_ARGS: term->display->display, atom 1817 C_ARGS: term->dpy, atom
1704 CLEANUP: 1818 CLEANUP:
1705 XFree (RETVAL); 1819 XFree (RETVAL);
1706 1820
1707void 1821void
1708XDeleteProperty (rxvt_term *term, Window window, Atom property) 1822XDeleteProperty (rxvt_term *term, Window window, Atom property)
1709 C_ARGS: term->display->display, window, property 1823 C_ARGS: term->dpy, window, property
1710 1824
1711Window 1825Window
1712rxvt_term::DefaultRootWindow () 1826rxvt_term::DefaultRootWindow ()
1713 CODE: 1827 CODE:
1714 RETVAL = THIS->display->root; 1828 RETVAL = THIS->display->root;
… …
1717 1831
1718#if 0 1832#if 0
1719 1833
1720Window 1834Window
1721XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1835XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1722 C_ARGS: term->display->display, (Window)parent, 1836 C_ARGS: term->dpy, (Window)parent,
1723 x, y, width, height, 0, 1837 x, y, width, height, 0,
1724 term->pix_colors_focused[Color_border], 1838 term->pix_colors_focused[Color_border],
1725 term->pix_colors_focused[Color_border] 1839 term->pix_colors_focused[Color_border]
1726 1840
1727#endif 1841#endif
1728 1842
1729void 1843void
1730XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1844XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1731 C_ARGS: term->display->display, window, parent, x, y 1845 C_ARGS: term->dpy, window, parent, x, y
1732 1846
1733void 1847void
1734XMapWindow (rxvt_term *term, Window window) 1848XMapWindow (rxvt_term *term, Window window)
1735 C_ARGS: term->display->display, window 1849 C_ARGS: term->dpy, window
1736 1850
1737void 1851void
1738XUnmapWindow (rxvt_term *term, Window window) 1852XUnmapWindow (rxvt_term *term, Window window)
1739 C_ARGS: term->display->display, window 1853 C_ARGS: term->dpy, window
1740 1854
1741void 1855void
1742XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1856XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1743 C_ARGS: term->display->display, (Window)window, x, y, width, height 1857 C_ARGS: term->dpy, window, x, y, width, height
1858
1859void
1860rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1861 CODE:
1862{
1863 XWindowAttributes attr;
1864 XGetWindowAttributes (THIS->dpy, window, &attr);
1865 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1866}
1744 1867
1745void 1868void
1746rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y) 1869rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1747 PPCODE: 1870 PPCODE:
1748{ 1871{
1749 int dx, dy; 1872 int dx, dy;
1750 Window child; 1873 Window child;
1751 1874
1752 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child)) 1875 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1753 { 1876 {
1754 EXTEND (SP, 3); 1877 EXTEND (SP, 3);
1755 PUSHs (newSViv (dx)); 1878 PUSHs (newSViv (dx));
1756 PUSHs (newSViv (dy)); 1879 PUSHs (newSViv (dy));
1757 PUSHs (newSVuv (child)); 1880 PUSHs (newSVuv (child));

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines