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.79 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.100 by root, Mon Feb 20 20:44:22 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 { 360 {
365 av_delete (av, i, G_DISCARD); 361 av_delete (overlay_av, i, G_DISCARD);
366 break; 362 break;
367 } 363 }
368 364
369 for (; i < AvFILL (av); i++) 365 for (; i < AvFILL (overlay_av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0))); 366 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
371 367
372 av_pop (av); 368 av_pop (overlay_av);
369
370 SvREFCNT_dec (overlay_av);
371 overlay_av = 0;
372
373 THIS->want_refresh = 1;
373} 374}
374 375
375void overlay::swap () 376void overlay::swap ()
376{ 377{
377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 378 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
492static void 493static void
493ungrab (rxvt_term *THIS) 494ungrab (rxvt_term *THIS)
494{ 495{
495 if (THIS->perl.grabtime) 496 if (THIS->perl.grabtime)
496 { 497 {
497 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 498 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 499 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
499 THIS->perl.grabtime = 0; 500 THIS->perl.grabtime = 0;
500 } 501 }
501} 502}
502 503
503bool 504bool
… …
554 break; 555 break;
555 556
556 case DT_STR_LEN: 557 case DT_STR_LEN:
557 { 558 {
558 char *str = va_arg (ap, char *); 559 char *str = va_arg (ap, char *);
559 int len = va_arg (ap, int); 560 int len = va_arg (ap, int);
560 561
561 XPUSHs (sv_2mortal (newSVpvn (str, len))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
562 } 563 }
563 break; 564 break;
564 565
565 case DT_WCS_LEN: 566 case DT_WCS_LEN:
566 { 567 {
567 wchar_t *wstr = va_arg (ap, wchar_t *); 568 wchar_t *wstr = va_arg (ap, wchar_t *);
568 int wlen = va_arg (ap, int); 569 int wlen = va_arg (ap, int);
569 570
570 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 }
573 break;
574
575 case DT_LCS_LEN:
576 {
577 long *lstr = va_arg (ap, long *);
578 int llen = va_arg (ap, int);
579
580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
571 } 581 }
572 break; 582 break;
573 583
574 case DT_XEVENT: 584 case DT_XEVENT:
575 { 585 {
576 XEvent *xe = va_arg (ap, XEvent *); 586 XEvent *xe = va_arg (ap, XEvent *);
577 HV *hv = newHV (); 587 HV *hv = newHV ();
578 588
579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 589# 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) 590# 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) 591# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
582# undef set 592# undef set
583 593
584 setiv (type, xe->type); 594 setiv (type, xe->type);
585 setiv (send_event, xe->xany.send_event); 595 setiv (send_event, xe->xany.send_event);
586 setiv (serial, xe->xany.serial); 596 setiv (serial, xe->xany.serial);
587 597
… …
596 setuv (root, xe->xmotion.root); 606 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow); 607 setuv (subwindow, xe->xmotion.subwindow);
598 setuv (time, xe->xmotion.time); 608 setuv (time, xe->xmotion.time);
599 setiv (x, xe->xmotion.x); 609 setiv (x, xe->xmotion.x);
600 setiv (y, xe->xmotion.y); 610 setiv (y, xe->xmotion.y);
601 setiv (row, xe->xmotion.y / term->fheight); 611 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
602 setiv (col, xe->xmotion.x / term->fwidth); 612 setiv (col, xe->xmotion.x / term->fwidth);
603 setiv (x_root, xe->xmotion.x_root); 613 setiv (x_root, xe->xmotion.x_root);
604 setiv (y_root, xe->xmotion.y_root); 614 setiv (y_root, xe->xmotion.y_root);
605 setuv (state, xe->xmotion.state); 615 setuv (state, xe->xmotion.state);
606 616
… …
638 setiv (height, xe->xconfigure.height); 648 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above); 649 setuv (above, xe->xconfigure.above);
640 break; 650 break;
641 } 651 }
642 652
653 break;
654
655 case PropertyNotify:
656 setuv (window, xe->xproperty.window);
657 setuv (atom, xe->xproperty.atom);
658 setuv (time, xe->xproperty.time);
659 setiv (state, xe->xproperty.state);
660 break;
661
662 case ClientMessage:
663 setuv (window, xe->xclient.window);
664 setuv (message_type, xe->xclient.message_type);
665 setuv (format, xe->xclient.format);
666 setuv (l0, xe->xclient.data.l[0]);
667 setuv (l1, xe->xclient.data.l[1]);
668 setuv (l2, xe->xclient.data.l[2]);
669 setuv (l3, xe->xclient.data.l[3]);
670 setuv (l4, xe->xclient.data.l[4]);
643 break; 671 break;
644 } 672 }
645 673
646 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 674 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
647 } 675 }
… …
698 } 726 }
699 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
700 { 728 {
701 clearSVptr ((SV *)term->perl.self); 729 clearSVptr ((SV *)term->perl.self);
702 SvREFCNT_dec ((SV *)term->perl.self); 730 SvREFCNT_dec ((SV *)term->perl.self);
731
732 // don't allow further calls
733 term->perl.self = 0;
703 } 734 }
704 735
705 swap (perl_environ, environ); 736 swap (perl_environ, environ);
706 737
707 return event_consumed; 738 return event_consumed;
… …
731# include "optinc.h" 762# include "optinc.h"
732# undef nodef 763# undef nodef
733# undef def 764# undef def
734 765
735 HV *stash = gv_stashpv ("urxvt", 1); 766 HV *stash = gv_stashpv ("urxvt", 1);
736 struct { 767 static const struct {
737 const char *name; 768 const char *name;
738 IV iv; 769 IV iv;
739 } *civ, const_iv[] = { 770 } *civ, const_iv[] = {
740# define const_iv(name) { # name, (IV)name } 771# define const_iv(name) { # name, (IV)name }
741 const_iv (DEFAULT_RSTYLE), 772 const_iv (DEFAULT_RSTYLE),
… …
824 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
825 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
826 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
827 const_iv (ClientMessage), 858 const_iv (ClientMessage),
828 const_iv (MappingNotify), 859 const_iv (MappingNotify),
860# if ENABLE_XIM_ONTHESPOT
861 const_iv (XIMReverse),
862 const_iv (XIMUnderline),
863 const_iv (XIMHighlight),
864 const_iv (XIMPrimary),
865 const_iv (XIMSecondary),
866 const_iv (XIMTertiary),
867 const_iv (XIMVisibleToForward),
868 const_iv (XIMVisibleToBackword),
869 const_iv (XIMVisibleToCenter),
870# if 0
871 const_iv (XIMForwardChar),
872 const_iv (XIMBackwardChar),
873 const_iv (XIMForwardWord),
874 const_iv (XIMBackwardWord),
875 const_iv (XIMCaretUp),
876 const_iv (XIMCaretDown),
877 const_iv (XIMNextLine),
878 const_iv (XIMPreviousLine),
879 const_iv (XIMLineStart),
880 const_iv (XIMLineEnd),
881 const_iv (XIMAbsolutePosition),
882 const_iv (XIMDontChange),
883# endif
884# endif
829 }; 885 };
830 886
831 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
832 civ-- > const_iv; )
833 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
834} 889}
835 890
836void 891void
837warn (const char *msg) 892warn (const char *msg)
… …
868 RETVAL 923 RETVAL
869 924
870int 925int
871SET_FGCOLOR (int rend, int new_color) 926SET_FGCOLOR (int rend, int new_color)
872 CODE: 927 CODE:
873 RETVAL = SET_FGCOLOR (rend, new_color); 928 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
874 OUTPUT: 929 OUTPUT:
875 RETVAL 930 RETVAL
876 931
877int 932int
878SET_BGCOLOR (int rend, int new_color) 933SET_BGCOLOR (int rend, int new_color)
879 CODE: 934 CODE:
880 RETVAL = SET_BGCOLOR (rend, new_color); 935 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
881 OUTPUT: 936 OUTPUT:
882 RETVAL 937 RETVAL
883 938
884int 939int
885GET_CUSTOM (int rend) 940GET_CUSTOM (int rend)
… …
899 | ((new_value << RS_customShift) & RS_customMask); 954 | ((new_value << RS_customShift) & RS_customMask);
900} 955}
901 OUTPUT: 956 OUTPUT:
902 RETVAL 957 RETVAL
903 958
959void
960termlist ()
961 PPCODE:
962{
963 EXTEND (SP, rxvt_term::termlist.size ());
964
965 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
966 if ((*t)->perl.self)
967 PUSHs (sv_2mortal (newSVterm (*t)));
968}
969
904MODULE = urxvt PACKAGE = urxvt::term 970MODULE = urxvt PACKAGE = urxvt::term
905 971
906SV * 972SV *
907_new (...) 973_new (AV *env, AV *arg)
908 CODE: 974 CODE:
909{ 975{
910 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
911 croak ("first argument to urxvt::term->_new must be arrayref");
912
913 rxvt_term *term = new rxvt_term; 976 rxvt_term *term = new rxvt_term;
914 977
915 term->argv = new stringvec; 978 stringvec *argv = new stringvec;
916 term->envv = new stringvec; 979 stringvec *envv = new stringvec;
917 980
918 for (int i = 1; i < items; i++) 981 for (int i = 0; i <= AvFILL (arg); i++)
919 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 982 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
920 983
921 AV *envv = (AV *)SvRV (ST (0));
922 for (int i = AvFILL (envv) + 1; i--; ) 984 for (int i = AvFILL (env) + 1; i--; )
923 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 985 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
924 986
925 term->envv->push_back (0); 987 envv->push_back (0);
926 988
927 bool success; 989 bool success;
928 990
929 try 991 try
930 { 992 {
931 success = term->init (term->argv->size (), term->argv->begin ()); 993 success = term->init (argv, envv);
932 } 994 }
933 catch (const class rxvt_failure_exception &e) 995 catch (const class rxvt_failure_exception &e)
934 { 996 {
935 success = false; 997 success = false;
936 } 998 }
… …
954rxvt_term::set_should_invoke (int htype, int inc) 1016rxvt_term::set_should_invoke (int htype, int inc)
955 CODE: 1017 CODE:
956 THIS->perl.should_invoke [htype] += inc; 1018 THIS->perl.should_invoke [htype] += inc;
957 1019
958void 1020void
959rxvt_term::grab_button (int button, U32 modifiers) 1021rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
960 CODE: 1022 CODE:
961 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1023 XGrabButton (THIS->dpy, button, modifiers, window, 1,
962 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1024 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
963 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1025 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
964 1026
1027void
1028rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029 CODE:
1030 XUngrabButton (THIS->dpy, button, modifiers, window);
1031
1032#if 0
1033
1034void
1035XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1036 C_ARGS:
1037 THIS->dpy, keycode, modifiers, window, 1,
1038 GrabModeSync, GrabModeSync
1039
1040void
1041XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1042 C_ARGS: THIS->dpy, keycode, modifiers, window
1043
1044#endif
1045
965bool 1046bool
966rxvt_term::grab (Time eventtime, int sync = 0) 1047rxvt_term::grab (Time eventtime, int sync = 0)
967 CODE: 1048 CODE:
968{ 1049{
969 int mode = sync ? GrabModeSync : GrabModeAsync; 1050 int mode = sync ? GrabModeSync : GrabModeAsync;
970 1051
971 THIS->perl.grabtime = 0; 1052 THIS->perl.grabtime = 0;
972 1053
973 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1054 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
974 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1055 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
975 mode, mode, None, GRAB_CURSOR, eventtime)) 1056 mode, mode, None, GRAB_CURSOR, eventtime))
976 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1057 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
977 THIS->perl.grabtime = eventtime; 1058 THIS->perl.grabtime = eventtime;
978 else 1059 else
979 XUngrabPointer (THIS->display->display, eventtime); 1060 XUngrabPointer (THIS->dpy, eventtime);
980 1061
981 RETVAL = !!THIS->perl.grabtime; 1062 RETVAL = !!THIS->perl.grabtime;
982} 1063}
983 OUTPUT: 1064 OUTPUT:
984 RETVAL 1065 RETVAL
985 1066
986void 1067void
987rxvt_term::allow_events_async () 1068rxvt_term::allow_events_async ()
988 CODE: 1069 CODE:
989 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1070 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
990 1071
991void 1072void
992rxvt_term::allow_events_sync () 1073rxvt_term::allow_events_sync ()
993 CODE: 1074 CODE:
994 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1075 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
995 1076
996void 1077void
997rxvt_term::allow_events_replay () 1078rxvt_term::allow_events_replay ()
998 CODE: 1079 CODE:
999 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1080 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1000 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1081 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1001 1082
1002void 1083void
1003rxvt_term::ungrab () 1084rxvt_term::ungrab ()
1004 CODE: 1085 CODE:
1005 ungrab (THIS); 1086 ungrab (THIS);
… …
1063#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1144#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1064#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1145#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1065#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1146#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1066#define TERM_OFFSET_focus TERM_OFFSET(focus) 1147#define TERM_OFFSET_focus TERM_OFFSET(focus)
1067#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1148#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1149#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1150#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1151#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1068#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1152#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1069#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1153#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1070#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1154#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1071 1155
1072int 1156int
… …
1079 fbase = TERM_OFFSET_fbase 1163 fbase = TERM_OFFSET_fbase
1080 nrow = TERM_OFFSET_nrow 1164 nrow = TERM_OFFSET_nrow
1081 ncol = TERM_OFFSET_ncol 1165 ncol = TERM_OFFSET_ncol
1082 focus = TERM_OFFSET_focus 1166 focus = TERM_OFFSET_focus
1083 mapped = TERM_OFFSET_mapped 1167 mapped = TERM_OFFSET_mapped
1168 int_bwidth = TERM_OFFSET_int_bwidth
1169 ext_bwidth = TERM_OFFSET_ext_bwidth
1170 lineSpace = TERM_OFFSET_lineSpace
1084 saveLines = TERM_OFFSET_saveLines 1171 saveLines = TERM_OFFSET_saveLines
1085 total_rows = TERM_OFFSET_total_rows 1172 total_rows = TERM_OFFSET_total_rows
1086 top_row = TERM_OFFSET_top_row 1173 top_row = TERM_OFFSET_top_row
1087 CODE: 1174 CODE:
1088 RETVAL = *(int *)((char *)THIS + ix); 1175 RETVAL = *(int *)((char *)THIS + ix);
… …
1093rxvt_term::ModLevel3Mask () 1180rxvt_term::ModLevel3Mask ()
1094 ALIAS: 1181 ALIAS:
1095 ModLevel3Mask = 0 1182 ModLevel3Mask = 0
1096 ModMetaMask = 1 1183 ModMetaMask = 1
1097 ModNumLockMask = 2 1184 ModNumLockMask = 2
1185 current_screen = 3
1186 hidden_cursor = 4
1098 CODE: 1187 CODE:
1099 switch (ix) 1188 switch (ix)
1100 { 1189 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1190 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1191 case 1: RETVAL = THIS->ModMetaMask; break;
1103 case 2: RETVAL = THIS->ModNumLockMask; break; 1192 case 2: RETVAL = THIS->ModNumLockMask; break;
1193 case 3: RETVAL = THIS->current_screen; break;
1194 case 4: RETVAL = THIS->hidden_cursor; break;
1104 } 1195 }
1105 OUTPUT: 1196 OUTPUT:
1106 RETVAL 1197 RETVAL
1107 1198
1108char * 1199char *
… …
1118 } 1209 }
1119 OUTPUT: 1210 OUTPUT:
1120 RETVAL 1211 RETVAL
1121 1212
1122SV * 1213SV *
1123rxvt_term::_env () 1214rxvt_term::envv ()
1215 ALIAS:
1216 argv = 1
1124 CODE: 1217 PPCODE:
1125{ 1218{
1126 if (THIS->envv) 1219 stringvec *vec = ix ? THIS->argv : THIS->envv;
1127 {
1128 AV *av = newAV ();
1129 1220
1221 EXTEND (SP, vec->size ());
1222
1130 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1223 for (char **i = vec->begin (); i != vec->end (); ++i)
1131 if (*i) 1224 if (*i)
1132 av_push (av, newSVpv (*i, 0)); 1225 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1133
1134 RETVAL = newRV_noinc ((SV *)av);
1135 }
1136 else
1137 RETVAL = &PL_sv_undef;
1138} 1226}
1139 OUTPUT:
1140 RETVAL
1141 1227
1142int 1228int
1143rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1229rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1144 CODE: 1230 CODE:
1145 RETVAL = THIS->pty_ev.events; 1231 RETVAL = THIS->pty_ev.events;
1146 if (events != EVENT_UNDEF) 1232 if (events != EVENT_UNDEF)
1147 THIS->pty_ev.set (events); 1233 THIS->pty_ev.set (events);
1148 OUTPUT: 1234 OUTPUT:
1149 RETVAL 1235 RETVAL
1150 1236
1237int
1238rxvt_term::pty_fd ()
1239 CODE:
1240 RETVAL = THIS->pty->pty;
1241 OUTPUT:
1242 RETVAL
1243
1151Window 1244Window
1152rxvt_term::parent () 1245rxvt_term::parent ()
1153 CODE: 1246 CODE:
1154 RETVAL = THIS->parent [0]; 1247 RETVAL = THIS->parent [0];
1155 OUTPUT: 1248 OUTPUT:
… …
1188} 1281}
1189 OUTPUT: 1282 OUTPUT:
1190 RETVAL 1283 RETVAL
1191 1284
1192void 1285void
1286rxvt_term::focus_in ()
1287
1288void
1289rxvt_term::focus_out ()
1290
1291void
1292rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1293 ALIAS:
1294 key_release = 1
1295 CODE:
1296{
1297 XKeyEvent xkey;
1298
1299 memset (&xkey, 0, sizeof (xkey));
1300
1301 xkey.time = time;
1302 xkey.state = state;
1303 xkey.keycode = keycode;
1304
1305 xkey.type = ix ? KeyRelease : KeyPress;
1306 xkey.display = THIS->dpy;
1307 xkey.window = THIS->vt;
1308 xkey.root = THIS->display->root;
1309 xkey.subwindow = THIS->vt;
1310
1311 if (ix)
1312 THIS->key_release (xkey);
1313 else
1314 THIS->key_press (xkey);
1315}
1316
1317void
1193rxvt_term::want_refresh () 1318rxvt_term::want_refresh ()
1194 CODE: 1319 CODE:
1195 THIS->want_refresh = 1; 1320 THIS->want_refresh = 1;
1196 1321
1197void 1322void
… …
1203 1328
1204 line_t &l = ROW(row_number); 1329 line_t &l = ROW(row_number);
1205 1330
1206 if (GIMME_V != G_VOID) 1331 if (GIMME_V != G_VOID)
1207 { 1332 {
1208 wchar_t *wstr = new wchar_t [THIS->ncol]; 1333 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1209 1334
1210 for (int col = 0; col < THIS->ncol; col++) 1335 for (int col = 0; col < THIS->ncol; col++)
1211 wstr [col] = l.t [col]; 1336 wstr [col] = l.t [col];
1212 1337
1213 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1338 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1214
1215 delete [] wstr;
1216 } 1339 }
1217 1340
1218 if (new_text) 1341 if (new_text)
1219 { 1342 {
1220 wchar_t *wstr = sv2wcs (new_text); 1343 wchar_t *wstr = sv2wcs (new_text);
1221 1344
1222 int len = min (wcslen (wstr) - start_ofs, max_len); 1345 int len = min (wcslen (wstr) - start_ofs, max_len);
1223 1346
1224 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1347 if (start_col < 0 || start_col + len > THIS->ncol)
1225 { 1348 {
1226 free (wstr); 1349 free (wstr);
1227 croak ("new_text extends beyond horizontal margins"); 1350 croak ("new_text extends beyond horizontal margins");
1228 } 1351 }
1229 1352
… …
1263 croak ("new_rend must be arrayref"); 1386 croak ("new_rend must be arrayref");
1264 1387
1265 AV *av = (AV *)SvRV (new_rend); 1388 AV *av = (AV *)SvRV (new_rend);
1266 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1389 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1267 1390
1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1391 if (start_col < 0 || start_col + len > THIS->ncol)
1269 croak ("new_rend array extends beyond horizontal margins"); 1392 croak ("new_rend array extends beyond horizontal margins");
1270 1393
1271 for (int col = start_col; col < start_col + len; col++) 1394 for (int col = start_col; col < start_col + len; col++)
1272 { 1395 {
1273 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1396 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1313rxvt_term::special_encode (SV *string) 1436rxvt_term::special_encode (SV *string)
1314 CODE: 1437 CODE:
1315{ 1438{
1316 wchar_t *wstr = sv2wcs (string); 1439 wchar_t *wstr = sv2wcs (string);
1317 int wlen = wcslen (wstr); 1440 int wlen = wcslen (wstr);
1318 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1441 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1319 1442
1320 rxvt_push_locale (THIS->locale); 1443 rxvt_push_locale (THIS->locale);
1321 1444
1322 wchar_t *r = rstr; 1445 wchar_t *r = rstr;
1323 for (wchar_t *s = wstr; *s; s++) 1446 for (wchar_t *s = wstr; *s; s++)
1447 {
1448 int w = WCWIDTH (*s);
1449
1324 if (wcwidth (*s) == 0) 1450 if (w == 0)
1325 { 1451 {
1326 if (r == rstr) 1452 if (r == rstr)
1327 croak ("leading combining character unencodable"); 1453 croak ("leading combining character unencodable");
1328 1454
1329 unicode_t n = rxvt_compose (r[-1], *s); 1455 unicode_t n = rxvt_compose (r[-1], *s);
1330 if (n == NOCHAR) 1456 if (n == NOCHAR)
1331 n = rxvt_composite.compose (r[-1], *s); 1457 n = rxvt_composite.compose (r[-1], *s);
1332 1458
1333 r[-1] = n; 1459 r[-1] = n;
1334 } 1460 }
1335#if !UNICODE_3 1461#if !UNICODE_3
1336 else if (*s >= 0x10000) 1462 else if (*s >= 0x10000)
1337 *r++ = rxvt_composite.compose (*s); 1463 *r++ = rxvt_composite.compose (*s);
1338#endif 1464#endif
1339 else 1465 else
1340 *r++ = *s; 1466 *r++ = *s;
1467
1468 // the *2 above only allows wcwidth <= 2
1469 if (w > 1)
1470 *r++ = NOCHAR;
1471 }
1341 1472
1342 rxvt_pop_locale (); 1473 rxvt_pop_locale ();
1343 1474
1344 RETVAL = wcs2sv (rstr, r - rstr); 1475 RETVAL = wcs2sv (rstr, r - rstr);
1345
1346 delete [] rstr;
1347} 1476}
1348 OUTPUT: 1477 OUTPUT:
1349 RETVAL 1478 RETVAL
1350 1479
1351SV * 1480SV *
… …
1363 else if (IS_COMPOSE (*s)) 1492 else if (IS_COMPOSE (*s))
1364 dlen += rxvt_composite.expand (*s, 0); 1493 dlen += rxvt_composite.expand (*s, 0);
1365 else 1494 else
1366 dlen++; 1495 dlen++;
1367 1496
1368 wchar_t *rstr = new wchar_t [dlen]; 1497 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1369 1498
1370 // decode 1499 // decode
1371 wchar_t *r = rstr; 1500 wchar_t *r = rstr;
1372 for (wchar_t *s = wstr; *s; s++) 1501 for (wchar_t *s = wstr; *s; s++)
1373 if (*s == NOCHAR) 1502 if (*s == NOCHAR)
… …
1376 r += rxvt_composite.expand (*s, r); 1505 r += rxvt_composite.expand (*s, r);
1377 else 1506 else
1378 *r++ = *s; 1507 *r++ = *s;
1379 1508
1380 RETVAL = wcs2sv (rstr, r - rstr); 1509 RETVAL = wcs2sv (rstr, r - rstr);
1381
1382 delete [] rstr;
1383} 1510}
1384 OUTPUT: 1511 OUTPUT:
1385 RETVAL 1512 RETVAL
1386 1513
1387void 1514void
1388rxvt_term::_resource (char *name, int index, SV *newval = 0) 1515rxvt_term::_resource (char *name, int index, SV *newval = 0)
1389 PPCODE: 1516 PPCODE:
1390{ 1517{
1391 struct resval { const char *name; int value; } rslist [] = { 1518 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1392# define def(name) { # name, Rs_ ## name }, 1519# define def(name) { # name, Rs_ ## name },
1393# define reserve(name,count) 1520# define reserve(name,count)
1394# include "rsinc.h" 1521# include "rsinc.h"
1395# undef def 1522# undef def
1396# undef reserve 1523# undef reserve
1397 }; 1524 };
1398 1525
1399 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1526 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1400 1527
1401 do { 1528 do {
1402 if (rs-- == rslist) 1529 if (rs-- == rslist)
1403 croak ("no such resource '%s', requested", name); 1530 croak ("no such resource '%s', requested", name);
1404 } while (strcmp (name, rs->name)); 1531 } while (strcmp (name, rs->name));
… …
1497 if (items == 3) 1624 if (items == 3)
1498 { 1625 {
1499 rc.row = SvIV (ST (1)); 1626 rc.row = SvIV (ST (1));
1500 rc.col = SvIV (ST (2)); 1627 rc.col = SvIV (ST (2));
1501 1628
1502 if (ix == 2 && rc.col == 0) 1629 if (ix == 2)
1503 { 1630 {
1631 if (rc.col == 0)
1632 {
1633 // col == 0 means end of previous line
1504 rc.row--; 1634 rc.row--;
1505 rc.col = THIS->ncol; 1635 rc.col = THIS->ncol;
1636 }
1637 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1638 && rc.col > ROW(rc.row).l)
1639 {
1640 // col >= length means while line and add newline
1641 rc.col = THIS->ncol;
1642 }
1506 } 1643 }
1507 1644
1508 clamp_it (rc.col, 0, THIS->ncol); 1645 clamp_it (rc.col, 0, THIS->ncol);
1509 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1646 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1510 1647
… …
1518 CODE: 1655 CODE:
1519 RETVAL = THIS->charsets [THIS->screen.charset]; 1656 RETVAL = THIS->charsets [THIS->screen.charset];
1520 OUTPUT: 1657 OUTPUT:
1521 RETVAL 1658 RETVAL
1522 1659
1523#void 1660void
1524#rxvt_term::selection_clear () 1661rxvt_term::selection_clear ()
1525 1662
1526void 1663void
1527rxvt_term::selection_make (Time eventtime, bool rect = false) 1664rxvt_term::selection_make (Time eventtime, bool rect = false)
1528 CODE: 1665 CODE:
1529 THIS->selection.op = SELECTION_CONT; 1666 THIS->selection.op = SELECTION_CONT;
… …
1557void 1694void
1558rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1695rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1559 1696
1560void 1697void
1561rxvt_term::scr_bell () 1698rxvt_term::scr_bell ()
1699
1700void
1701rxvt_term::scr_change_screen (int screen)
1562 1702
1563void 1703void
1564rxvt_term::scr_add_lines (SV *string) 1704rxvt_term::scr_add_lines (SV *string)
1565 CODE: 1705 CODE:
1566{ 1706{
… …
1616void 1756void
1617rxvt_term::XListProperties (Window window) 1757rxvt_term::XListProperties (Window window)
1618 PPCODE: 1758 PPCODE:
1619{ 1759{
1620 int count; 1760 int count;
1621 Atom *props = XListProperties (THIS->display->display, window, &count); 1761 Atom *props = XListProperties (THIS->dpy, window, &count);
1622 1762
1623 EXTEND (SP, count); 1763 EXTEND (SP, count);
1624 while (count--) 1764 while (count--)
1625 PUSHs (newSVuv ((U32)props [count])); 1765 PUSHs (newSVuv ((U32)props [count]));
1626 1766
… …
1634 Atom type; 1774 Atom type;
1635 int format; 1775 int format;
1636 unsigned long nitems; 1776 unsigned long nitems;
1637 unsigned long bytes_after; 1777 unsigned long bytes_after;
1638 unsigned char *prop; 1778 unsigned char *prop;
1779
1639 XGetWindowProperty (THIS->display->display, window, property, 1780 XGetWindowProperty (THIS->dpy, window, property,
1640 0, 1<<30, 0, AnyPropertyType, 1781 0, 1<<24, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop); 1782 &type, &format, &nitems, &bytes_after, &prop);
1783
1642 if (type != None) 1784 if (type != None)
1643 { 1785 {
1786 int elemsize = format == 16 ? sizeof (short)
1787 : format == 32 ? sizeof (long)
1788 : 1;
1789
1644 EXTEND (SP, 3); 1790 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type)); 1791 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format)); 1792 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1793 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1648 XFree (prop); 1794 XFree (prop);
1649 } 1795 }
1650} 1796}
1651 1797
1652void 1798void
… …
1654 CODE: 1800 CODE:
1655{ 1801{
1656 STRLEN len; 1802 STRLEN len;
1657 char *data_ = SvPVbyte (data, len); 1803 char *data_ = SvPVbyte (data, len);
1658 1804
1805 int elemsize = format == 16 ? sizeof (short)
1806 : format == 32 ? sizeof (long)
1807 : 1;
1808
1659 XChangeProperty (THIS->display->display, window, property, 1809 XChangeProperty (THIS->dpy, window, property,
1660 type, format, PropModeReplace, 1810 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format); 1811 (unsigned char *)data_, len / elemsize);
1662} 1812}
1813
1814Atom
1815XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1816 C_ARGS: term->dpy, atom_name, only_if_exists
1817
1818char *
1819XGetAtomName (rxvt_term *term, Atom atom)
1820 C_ARGS: term->dpy, atom
1821 CLEANUP:
1822 XFree (RETVAL);
1663 1823
1664void 1824void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property) 1825XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property 1826 C_ARGS: term->dpy, window, property
1667 1827
1668Window 1828Window
1669rxvt_term::DefaultRootWindow () 1829rxvt_term::DefaultRootWindow ()
1670 CODE: 1830 CODE:
1671 RETVAL = THIS->display->root; 1831 RETVAL = THIS->display->root;
1672 OUTPUT: 1832 OUTPUT:
1673 RETVAL 1833 RETVAL
1674 1834
1835#if 0
1836
1675Window 1837Window
1676XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height) 1838XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1677 C_ARGS: term->display->display, (Window)parent, 1839 C_ARGS: term->dpy, (Window)parent,
1678 x, y, width, height, 0, 1840 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border], 1841 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border] 1842 term->pix_colors_focused[Color_border]
1681 1843
1844#endif
1845
1682void 1846void
1683XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0) 1847XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1684 C_ARGS: term->display->display, window, parent, x, y 1848 C_ARGS: term->dpy, window, parent, x, y
1685 1849
1686void 1850void
1687XMapWindow (rxvt_term *term, Window window) 1851XMapWindow (rxvt_term *term, Window window)
1688 C_ARGS: term->display->display, window 1852 C_ARGS: term->dpy, window
1689 1853
1690void 1854void
1691XUnmapWindow (rxvt_term *term, Window window) 1855XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window 1856 C_ARGS: term->dpy, window
1693 1857
1694void 1858void
1695XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height) 1859XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1696 C_ARGS: term->display->display, (Window)window, x, y, width, height 1860 C_ARGS: term->dpy, window, x, y, width, height
1861
1862void
1863rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1864 CODE:
1865{
1866 XWindowAttributes attr;
1867 XGetWindowAttributes (THIS->dpy, window, &attr);
1868 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1869}
1870
1871void
1872rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1873 PPCODE:
1874{
1875 int dx, dy;
1876 Window child;
1877
1878 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1879 {
1880 EXTEND (SP, 3);
1881 PUSHs (newSViv (dx));
1882 PUSHs (newSViv (dy));
1883 PUSHs (newSVuv (child));
1884 }
1885}
1697 1886
1698############################################################################# 1887#############################################################################
1699# urxvt::overlay 1888# urxvt::overlay
1700############################################################################# 1889#############################################################################
1701 1890
… …
1847 w->self = (HV *)SvRV (RETVAL); 2036 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT: 2037 OUTPUT:
1849 RETVAL 2038 RETVAL
1850 2039
1851CHAINED 2040CHAINED
1852iow::start () 2041iw::start ()
1853 CODE: 2042 CODE:
1854 THIS->start (); 2043 THIS->start ();
1855 OUTPUT: 2044 OUTPUT:
1856 RETVAL 2045 RETVAL
1857 2046
1858CHAINED 2047CHAINED
1859iow::stop () 2048iw::stop ()
1860 CODE: 2049 CODE:
1861 THIS->stop (); 2050 THIS->stop ();
1862 OUTPUT: 2051 OUTPUT:
1863 RETVAL 2052 RETVAL
1864 2053
… …
1886 THIS->start (pid); 2075 THIS->start (pid);
1887 OUTPUT: 2076 OUTPUT:
1888 RETVAL 2077 RETVAL
1889 2078
1890CHAINED 2079CHAINED
1891iow::stop () 2080pw::stop ()
1892 CODE: 2081 CODE:
1893 THIS->stop (); 2082 THIS->stop ();
1894 OUTPUT: 2083 OUTPUT:
1895 RETVAL 2084 RETVAL
1896 2085

Diff Legend

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