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.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
… …
638 setiv (height, xe->xconfigure.height); 645 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above); 646 setuv (above, xe->xconfigure.above);
640 break; 647 break;
641 } 648 }
642 649
650 break;
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
659 case ClientMessage:
660 setuv (window, xe->xclient.window);
661 setuv (message_type, xe->xclient.message_type);
662 setuv (format, xe->xclient.format);
663 setuv (l0, xe->xclient.data.l[0]);
664 setuv (l1, xe->xclient.data.l[1]);
665 setuv (l2, xe->xclient.data.l[2]);
666 setuv (l3, xe->xclient.data.l[3]);
667 setuv (l4, xe->xclient.data.l[4]);
643 break; 668 break;
644 } 669 }
645 670
646 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 671 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
647 } 672 }
… …
698 } 723 }
699 else if (htype == HOOK_DESTROY) 724 else if (htype == HOOK_DESTROY)
700 { 725 {
701 clearSVptr ((SV *)term->perl.self); 726 clearSVptr ((SV *)term->perl.self);
702 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;
703 } 731 }
704 732
705 swap (perl_environ, environ); 733 swap (perl_environ, environ);
706 734
707 return event_consumed; 735 return event_consumed;
… …
731# include "optinc.h" 759# include "optinc.h"
732# undef nodef 760# undef nodef
733# undef def 761# undef def
734 762
735 HV *stash = gv_stashpv ("urxvt", 1); 763 HV *stash = gv_stashpv ("urxvt", 1);
736 struct { 764 static const struct {
737 const char *name; 765 const char *name;
738 IV iv; 766 IV iv;
739 } *civ, const_iv[] = { 767 } *civ, const_iv[] = {
740# define const_iv(name) { # name, (IV)name } 768# define const_iv(name) { # name, (IV)name }
741 const_iv (DEFAULT_RSTYLE), 769 const_iv (DEFAULT_RSTYLE),
… …
824 const_iv (SelectionRequest), 852 const_iv (SelectionRequest),
825 const_iv (SelectionNotify), 853 const_iv (SelectionNotify),
826 const_iv (ColormapNotify), 854 const_iv (ColormapNotify),
827 const_iv (ClientMessage), 855 const_iv (ClientMessage),
828 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
829 }; 882 };
830 883
831 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; )
832 civ-- > const_iv; )
833 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 885 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
834} 886}
835 887
836void 888void
837warn (const char *msg) 889warn (const char *msg)
… …
868 RETVAL 920 RETVAL
869 921
870int 922int
871SET_FGCOLOR (int rend, int new_color) 923SET_FGCOLOR (int rend, int new_color)
872 CODE: 924 CODE:
873 RETVAL = SET_FGCOLOR (rend, new_color); 925 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
874 OUTPUT: 926 OUTPUT:
875 RETVAL 927 RETVAL
876 928
877int 929int
878SET_BGCOLOR (int rend, int new_color) 930SET_BGCOLOR (int rend, int new_color)
879 CODE: 931 CODE:
880 RETVAL = SET_BGCOLOR (rend, new_color); 932 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
881 OUTPUT: 933 OUTPUT:
882 RETVAL 934 RETVAL
883 935
884int 936int
885GET_CUSTOM (int rend) 937GET_CUSTOM (int rend)
… …
899 | ((new_value << RS_customShift) & RS_customMask); 951 | ((new_value << RS_customShift) & RS_customMask);
900} 952}
901 OUTPUT: 953 OUTPUT:
902 RETVAL 954 RETVAL
903 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
904MODULE = urxvt PACKAGE = urxvt::term 967MODULE = urxvt PACKAGE = urxvt::term
905 968
906SV * 969SV *
907_new (...) 970_new (AV *env, AV *arg)
908 CODE: 971 CODE:
909{ 972{
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; 973 rxvt_term *term = new rxvt_term;
914 974
915 term->argv = new stringvec; 975 stringvec *argv = new stringvec;
916 term->envv = new stringvec; 976 stringvec *envv = new stringvec;
917 977
918 for (int i = 1; i < items; i++) 978 for (int i = 0; i <= AvFILL (arg); i++)
919 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 979 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
920 980
921 AV *envv = (AV *)SvRV (ST (0));
922 for (int i = AvFILL (envv) + 1; i--; ) 981 for (int i = AvFILL (env) + 1; i--; )
923 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 982 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
924 983
925 term->envv->push_back (0); 984 envv->push_back (0);
926 985
927 bool success; 986 bool success;
928 987
929 try 988 try
930 { 989 {
931 success = term->init (term->argv->size (), term->argv->begin ()); 990 success = term->init (argv, envv);
932 } 991 }
933 catch (const class rxvt_failure_exception &e) 992 catch (const class rxvt_failure_exception &e)
934 { 993 {
935 success = false; 994 success = false;
936 } 995 }
… …
954rxvt_term::set_should_invoke (int htype, int inc) 1013rxvt_term::set_should_invoke (int htype, int inc)
955 CODE: 1014 CODE:
956 THIS->perl.should_invoke [htype] += inc; 1015 THIS->perl.should_invoke [htype] += inc;
957 1016
958void 1017void
959rxvt_term::grab_button (int button, U32 modifiers) 1018rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
960 CODE: 1019 CODE:
961 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1020 XGrabButton (THIS->dpy, button, modifiers, window, 1,
962 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1021 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
963 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1022 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
964 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
965bool 1043bool
966rxvt_term::grab (Time eventtime, int sync = 0) 1044rxvt_term::grab (Time eventtime, int sync = 0)
967 CODE: 1045 CODE:
968{ 1046{
969 int mode = sync ? GrabModeSync : GrabModeAsync; 1047 int mode = sync ? GrabModeSync : GrabModeAsync;
970 1048
971 THIS->perl.grabtime = 0; 1049 THIS->perl.grabtime = 0;
972 1050
973 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1051 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
974 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1052 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
975 mode, mode, None, GRAB_CURSOR, eventtime)) 1053 mode, mode, None, GRAB_CURSOR, eventtime))
976 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1054 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
977 THIS->perl.grabtime = eventtime; 1055 THIS->perl.grabtime = eventtime;
978 else 1056 else
979 XUngrabPointer (THIS->display->display, eventtime); 1057 XUngrabPointer (THIS->dpy, eventtime);
980 1058
981 RETVAL = !!THIS->perl.grabtime; 1059 RETVAL = !!THIS->perl.grabtime;
982} 1060}
983 OUTPUT: 1061 OUTPUT:
984 RETVAL 1062 RETVAL
985 1063
986void 1064void
987rxvt_term::allow_events_async () 1065rxvt_term::allow_events_async ()
988 CODE: 1066 CODE:
989 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1067 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
990 1068
991void 1069void
992rxvt_term::allow_events_sync () 1070rxvt_term::allow_events_sync ()
993 CODE: 1071 CODE:
994 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1072 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
995 1073
996void 1074void
997rxvt_term::allow_events_replay () 1075rxvt_term::allow_events_replay ()
998 CODE: 1076 CODE:
999 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1077 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1000 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1078 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1001 1079
1002void 1080void
1003rxvt_term::ungrab () 1081rxvt_term::ungrab ()
1004 CODE: 1082 CODE:
1005 ungrab (THIS); 1083 ungrab (THIS);
… …
1063#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1141#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1064#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1142#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1065#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1143#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1066#define TERM_OFFSET_focus TERM_OFFSET(focus) 1144#define TERM_OFFSET_focus TERM_OFFSET(focus)
1067#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1145#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1146#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1147#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1148#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1068#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1149#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1069#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1150#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1070#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1151#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1071 1152
1072int 1153int
… …
1079 fbase = TERM_OFFSET_fbase 1160 fbase = TERM_OFFSET_fbase
1080 nrow = TERM_OFFSET_nrow 1161 nrow = TERM_OFFSET_nrow
1081 ncol = TERM_OFFSET_ncol 1162 ncol = TERM_OFFSET_ncol
1082 focus = TERM_OFFSET_focus 1163 focus = TERM_OFFSET_focus
1083 mapped = TERM_OFFSET_mapped 1164 mapped = TERM_OFFSET_mapped
1165 int_bwidth = TERM_OFFSET_int_bwidth
1166 ext_bwidth = TERM_OFFSET_ext_bwidth
1167 lineSpace = TERM_OFFSET_lineSpace
1084 saveLines = TERM_OFFSET_saveLines 1168 saveLines = TERM_OFFSET_saveLines
1085 total_rows = TERM_OFFSET_total_rows 1169 total_rows = TERM_OFFSET_total_rows
1086 top_row = TERM_OFFSET_top_row 1170 top_row = TERM_OFFSET_top_row
1087 CODE: 1171 CODE:
1088 RETVAL = *(int *)((char *)THIS + ix); 1172 RETVAL = *(int *)((char *)THIS + ix);
… …
1093rxvt_term::ModLevel3Mask () 1177rxvt_term::ModLevel3Mask ()
1094 ALIAS: 1178 ALIAS:
1095 ModLevel3Mask = 0 1179 ModLevel3Mask = 0
1096 ModMetaMask = 1 1180 ModMetaMask = 1
1097 ModNumLockMask = 2 1181 ModNumLockMask = 2
1182 current_screen = 3
1183 hidden_cursor = 4
1098 CODE: 1184 CODE:
1099 switch (ix) 1185 switch (ix)
1100 { 1186 {
1101 case 0: RETVAL = THIS->ModLevel3Mask; break; 1187 case 0: RETVAL = THIS->ModLevel3Mask; break;
1102 case 1: RETVAL = THIS->ModMetaMask; break; 1188 case 1: RETVAL = THIS->ModMetaMask; break;
1103 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;
1104 } 1192 }
1105 OUTPUT: 1193 OUTPUT:
1106 RETVAL 1194 RETVAL
1107 1195
1108char * 1196char *
… …
1118 } 1206 }
1119 OUTPUT: 1207 OUTPUT:
1120 RETVAL 1208 RETVAL
1121 1209
1122SV * 1210SV *
1123rxvt_term::_env () 1211rxvt_term::envv ()
1212 ALIAS:
1213 argv = 1
1124 CODE: 1214 PPCODE:
1125{ 1215{
1126 if (THIS->envv) 1216 stringvec *vec = ix ? THIS->argv : THIS->envv;
1127 {
1128 AV *av = newAV ();
1129 1217
1218 EXTEND (SP, vec->size ());
1219
1130 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1220 for (char **i = vec->begin (); i != vec->end (); ++i)
1131 if (*i) 1221 if (*i)
1132 av_push (av, newSVpv (*i, 0)); 1222 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1133
1134 RETVAL = newRV_noinc ((SV *)av);
1135 }
1136 else
1137 RETVAL = &PL_sv_undef;
1138} 1223}
1139 OUTPUT:
1140 RETVAL
1141 1224
1142int 1225int
1143rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1226rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1144 CODE: 1227 CODE:
1145 RETVAL = THIS->pty_ev.events; 1228 RETVAL = THIS->pty_ev.events;
1146 if (events != EVENT_UNDEF) 1229 if (events != EVENT_UNDEF)
1147 THIS->pty_ev.set (events); 1230 THIS->pty_ev.set (events);
1148 OUTPUT: 1231 OUTPUT:
1149 RETVAL 1232 RETVAL
1150 1233
1234int
1235rxvt_term::pty_fd ()
1236 CODE:
1237 RETVAL = THIS->pty->pty;
1238 OUTPUT:
1239 RETVAL
1240
1151Window 1241Window
1152rxvt_term::parent () 1242rxvt_term::parent ()
1153 CODE: 1243 CODE:
1154 RETVAL = THIS->parent [0]; 1244 RETVAL = THIS->parent [0];
1155 OUTPUT: 1245 OUTPUT:
… …
1188} 1278}
1189 OUTPUT: 1279 OUTPUT:
1190 RETVAL 1280 RETVAL
1191 1281
1192void 1282void
1283rxvt_term::focus_in ()
1284
1285void
1286rxvt_term::focus_out ()
1287
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
1193rxvt_term::want_refresh () 1315rxvt_term::want_refresh ()
1194 CODE: 1316 CODE:
1195 THIS->want_refresh = 1; 1317 THIS->want_refresh = 1;
1196 1318
1197void 1319void
… …
1203 1325
1204 line_t &l = ROW(row_number); 1326 line_t &l = ROW(row_number);
1205 1327
1206 if (GIMME_V != G_VOID) 1328 if (GIMME_V != G_VOID)
1207 { 1329 {
1208 wchar_t *wstr = new wchar_t [THIS->ncol]; 1330 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1209 1331
1210 for (int col = 0; col < THIS->ncol; col++) 1332 for (int col = 0; col < THIS->ncol; col++)
1211 wstr [col] = l.t [col]; 1333 wstr [col] = l.t [col];
1212 1334
1213 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1335 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1214
1215 delete [] wstr;
1216 } 1336 }
1217 1337
1218 if (new_text) 1338 if (new_text)
1219 { 1339 {
1220 wchar_t *wstr = sv2wcs (new_text); 1340 wchar_t *wstr = sv2wcs (new_text);
1221 1341
1222 int len = min (wcslen (wstr) - start_ofs, max_len); 1342 int len = min (wcslen (wstr) - start_ofs, max_len);
1223 1343
1224 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1344 if (start_col < 0 || start_col + len > THIS->ncol)
1225 { 1345 {
1226 free (wstr); 1346 free (wstr);
1227 croak ("new_text extends beyond horizontal margins"); 1347 croak ("new_text extends beyond horizontal margins");
1228 } 1348 }
1229 1349
… …
1263 croak ("new_rend must be arrayref"); 1383 croak ("new_rend must be arrayref");
1264 1384
1265 AV *av = (AV *)SvRV (new_rend); 1385 AV *av = (AV *)SvRV (new_rend);
1266 int len = min (AvFILL (av) + 1 - start_ofs, max_len); 1386 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1267 1387
1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1388 if (start_col < 0 || start_col + len > THIS->ncol)
1269 croak ("new_rend array extends beyond horizontal margins"); 1389 croak ("new_rend array extends beyond horizontal margins");
1270 1390
1271 for (int col = start_col; col < start_col + len; col++) 1391 for (int col = start_col; col < start_col + len; col++)
1272 { 1392 {
1273 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1393 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1313rxvt_term::special_encode (SV *string) 1433rxvt_term::special_encode (SV *string)
1314 CODE: 1434 CODE:
1315{ 1435{
1316 wchar_t *wstr = sv2wcs (string); 1436 wchar_t *wstr = sv2wcs (string);
1317 int wlen = wcslen (wstr); 1437 int wlen = wcslen (wstr);
1318 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1438 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1319 1439
1320 rxvt_push_locale (THIS->locale); 1440 rxvt_push_locale (THIS->locale);
1321 1441
1322 wchar_t *r = rstr; 1442 wchar_t *r = rstr;
1323 for (wchar_t *s = wstr; *s; s++) 1443 for (wchar_t *s = wstr; *s; s++)
1444 {
1445 int w = WCWIDTH (*s);
1446
1324 if (wcwidth (*s) == 0) 1447 if (w == 0)
1325 { 1448 {
1326 if (r == rstr) 1449 if (r == rstr)
1327 croak ("leading combining character unencodable"); 1450 croak ("leading combining character unencodable");
1328 1451
1329 unicode_t n = rxvt_compose (r[-1], *s); 1452 unicode_t n = rxvt_compose (r[-1], *s);
1330 if (n == NOCHAR) 1453 if (n == NOCHAR)
1331 n = rxvt_composite.compose (r[-1], *s); 1454 n = rxvt_composite.compose (r[-1], *s);
1332 1455
1333 r[-1] = n; 1456 r[-1] = n;
1334 } 1457 }
1335#if !UNICODE_3 1458#if !UNICODE_3
1336 else if (*s >= 0x10000) 1459 else if (*s >= 0x10000)
1337 *r++ = rxvt_composite.compose (*s); 1460 *r++ = rxvt_composite.compose (*s);
1338#endif 1461#endif
1339 else 1462 else
1340 *r++ = *s; 1463 *r++ = *s;
1464
1465 // the *2 above only allows wcwidth <= 2
1466 if (w > 1)
1467 *r++ = NOCHAR;
1468 }
1341 1469
1342 rxvt_pop_locale (); 1470 rxvt_pop_locale ();
1343 1471
1344 RETVAL = wcs2sv (rstr, r - rstr); 1472 RETVAL = wcs2sv (rstr, r - rstr);
1345
1346 delete [] rstr;
1347} 1473}
1348 OUTPUT: 1474 OUTPUT:
1349 RETVAL 1475 RETVAL
1350 1476
1351SV * 1477SV *
… …
1363 else if (IS_COMPOSE (*s)) 1489 else if (IS_COMPOSE (*s))
1364 dlen += rxvt_composite.expand (*s, 0); 1490 dlen += rxvt_composite.expand (*s, 0);
1365 else 1491 else
1366 dlen++; 1492 dlen++;
1367 1493
1368 wchar_t *rstr = new wchar_t [dlen]; 1494 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1369 1495
1370 // decode 1496 // decode
1371 wchar_t *r = rstr; 1497 wchar_t *r = rstr;
1372 for (wchar_t *s = wstr; *s; s++) 1498 for (wchar_t *s = wstr; *s; s++)
1373 if (*s == NOCHAR) 1499 if (*s == NOCHAR)
… …
1376 r += rxvt_composite.expand (*s, r); 1502 r += rxvt_composite.expand (*s, r);
1377 else 1503 else
1378 *r++ = *s; 1504 *r++ = *s;
1379 1505
1380 RETVAL = wcs2sv (rstr, r - rstr); 1506 RETVAL = wcs2sv (rstr, r - rstr);
1381
1382 delete [] rstr;
1383} 1507}
1384 OUTPUT: 1508 OUTPUT:
1385 RETVAL 1509 RETVAL
1386 1510
1387void 1511void
1388rxvt_term::_resource (char *name, int index, SV *newval = 0) 1512rxvt_term::_resource (char *name, int index, SV *newval = 0)
1389 PPCODE: 1513 PPCODE:
1390{ 1514{
1391 struct resval { const char *name; int value; } rslist [] = { 1515 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1392# define def(name) { # name, Rs_ ## name }, 1516# define def(name) { # name, Rs_ ## name },
1393# define reserve(name,count) 1517# define reserve(name,count)
1394# include "rsinc.h" 1518# include "rsinc.h"
1395# undef def 1519# undef def
1396# undef reserve 1520# undef reserve
1397 }; 1521 };
1398 1522
1399 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1523 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1400 1524
1401 do { 1525 do {
1402 if (rs-- == rslist) 1526 if (rs-- == rslist)
1403 croak ("no such resource '%s', requested", name); 1527 croak ("no such resource '%s', requested", name);
1404 } while (strcmp (name, rs->name)); 1528 } while (strcmp (name, rs->name));
… …
1497 if (items == 3) 1621 if (items == 3)
1498 { 1622 {
1499 rc.row = SvIV (ST (1)); 1623 rc.row = SvIV (ST (1));
1500 rc.col = SvIV (ST (2)); 1624 rc.col = SvIV (ST (2));
1501 1625
1502 if (ix == 2 && rc.col == 0) 1626 if (ix == 2)
1503 { 1627 {
1628 if (rc.col == 0)
1629 {
1630 // col == 0 means end of previous line
1504 rc.row--; 1631 rc.row--;
1505 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 }
1506 } 1640 }
1507 1641
1508 clamp_it (rc.col, 0, THIS->ncol); 1642 clamp_it (rc.col, 0, THIS->ncol);
1509 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1643 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1510 1644
… …
1518 CODE: 1652 CODE:
1519 RETVAL = THIS->charsets [THIS->screen.charset]; 1653 RETVAL = THIS->charsets [THIS->screen.charset];
1520 OUTPUT: 1654 OUTPUT:
1521 RETVAL 1655 RETVAL
1522 1656
1523#void 1657void
1524#rxvt_term::selection_clear () 1658rxvt_term::selection_clear ()
1525 1659
1526void 1660void
1527rxvt_term::selection_make (Time eventtime, bool rect = false) 1661rxvt_term::selection_make (Time eventtime, bool rect = false)
1528 CODE: 1662 CODE:
1529 THIS->selection.op = SELECTION_CONT; 1663 THIS->selection.op = SELECTION_CONT;
… …
1557void 1691void
1558rxvt_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)
1559 1693
1560void 1694void
1561rxvt_term::scr_bell () 1695rxvt_term::scr_bell ()
1696
1697void
1698rxvt_term::scr_change_screen (int screen)
1562 1699
1563void 1700void
1564rxvt_term::scr_add_lines (SV *string) 1701rxvt_term::scr_add_lines (SV *string)
1565 CODE: 1702 CODE:
1566{ 1703{
… …
1616void 1753void
1617rxvt_term::XListProperties (Window window) 1754rxvt_term::XListProperties (Window window)
1618 PPCODE: 1755 PPCODE:
1619{ 1756{
1620 int count; 1757 int count;
1621 Atom *props = XListProperties (THIS->display->display, window, &count); 1758 Atom *props = XListProperties (THIS->dpy, window, &count);
1622 1759
1623 EXTEND (SP, count); 1760 EXTEND (SP, count);
1624 while (count--) 1761 while (count--)
1625 PUSHs (newSVuv ((U32)props [count])); 1762 PUSHs (newSVuv ((U32)props [count]));
1626 1763
… …
1634 Atom type; 1771 Atom type;
1635 int format; 1772 int format;
1636 unsigned long nitems; 1773 unsigned long nitems;
1637 unsigned long bytes_after; 1774 unsigned long bytes_after;
1638 unsigned char *prop; 1775 unsigned char *prop;
1776
1639 XGetWindowProperty (THIS->display->display, window, property, 1777 XGetWindowProperty (THIS->dpy, window, property,
1640 0, 1<<30, 0, AnyPropertyType, 1778 0, 1<<24, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop); 1779 &type, &format, &nitems, &bytes_after, &prop);
1780
1642 if (type != None) 1781 if (type != None)
1643 { 1782 {
1783 int elemsize = format == 16 ? sizeof (short)
1784 : format == 32 ? sizeof (long)
1785 : 1;
1786
1644 EXTEND (SP, 3); 1787 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type)); 1788 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format)); 1789 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8)); 1790 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1648 XFree (prop); 1791 XFree (prop);
1649 } 1792 }
1650} 1793}
1651 1794
1652void 1795void
… …
1654 CODE: 1797 CODE:
1655{ 1798{
1656 STRLEN len; 1799 STRLEN len;
1657 char *data_ = SvPVbyte (data, len); 1800 char *data_ = SvPVbyte (data, len);
1658 1801
1802 int elemsize = format == 16 ? sizeof (short)
1803 : format == 32 ? sizeof (long)
1804 : 1;
1805
1659 XChangeProperty (THIS->display->display, window, property, 1806 XChangeProperty (THIS->dpy, window, property,
1660 type, format, PropModeReplace, 1807 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format); 1808 (unsigned char *)data_, len / elemsize);
1662} 1809}
1810
1811Atom
1812XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1813 C_ARGS: term->dpy, atom_name, only_if_exists
1814
1815char *
1816XGetAtomName (rxvt_term *term, Atom atom)
1817 C_ARGS: term->dpy, atom
1818 CLEANUP:
1819 XFree (RETVAL);
1663 1820
1664void 1821void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property) 1822XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property 1823 C_ARGS: term->dpy, window, property
1667 1824
1668Window 1825Window
1669rxvt_term::DefaultRootWindow () 1826rxvt_term::DefaultRootWindow ()
1670 CODE: 1827 CODE:
1671 RETVAL = THIS->display->root; 1828 RETVAL = THIS->display->root;
1672 OUTPUT: 1829 OUTPUT:
1673 RETVAL 1830 RETVAL
1674 1831
1832#if 0
1833
1675Window 1834Window
1676XCreateSimpleWindow (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)
1677 C_ARGS: term->display->display, (Window)parent, 1836 C_ARGS: term->dpy, (Window)parent,
1678 x, y, width, height, 0, 1837 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border], 1838 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border] 1839 term->pix_colors_focused[Color_border]
1681 1840
1841#endif
1842
1682void 1843void
1683XReparentWindow (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)
1684 C_ARGS: term->display->display, window, parent, x, y 1845 C_ARGS: term->dpy, window, parent, x, y
1685 1846
1686void 1847void
1687XMapWindow (rxvt_term *term, Window window) 1848XMapWindow (rxvt_term *term, Window window)
1688 C_ARGS: term->display->display, window 1849 C_ARGS: term->dpy, window
1689 1850
1690void 1851void
1691XUnmapWindow (rxvt_term *term, Window window) 1852XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window 1853 C_ARGS: term->dpy, window
1693 1854
1694void 1855void
1695XMoveResizeWindow (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)
1696 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}
1867
1868void
1869rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1870 PPCODE:
1871{
1872 int dx, dy;
1873 Window child;
1874
1875 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1876 {
1877 EXTEND (SP, 3);
1878 PUSHs (newSViv (dx));
1879 PUSHs (newSViv (dy));
1880 PUSHs (newSVuv (child));
1881 }
1882}
1697 1883
1698############################################################################# 1884#############################################################################
1699# urxvt::overlay 1885# urxvt::overlay
1700############################################################################# 1886#############################################################################
1701 1887
… …
1847 w->self = (HV *)SvRV (RETVAL); 2033 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT: 2034 OUTPUT:
1849 RETVAL 2035 RETVAL
1850 2036
1851CHAINED 2037CHAINED
1852iow::start () 2038iw::start ()
1853 CODE: 2039 CODE:
1854 THIS->start (); 2040 THIS->start ();
1855 OUTPUT: 2041 OUTPUT:
1856 RETVAL 2042 RETVAL
1857 2043
1858CHAINED 2044CHAINED
1859iow::stop () 2045iw::stop ()
1860 CODE: 2046 CODE:
1861 THIS->stop (); 2047 THIS->stop ();
1862 OUTPUT: 2048 OUTPUT:
1863 RETVAL 2049 RETVAL
1864 2050
… …
1886 THIS->start (pid); 2072 THIS->start (pid);
1887 OUTPUT: 2073 OUTPUT:
1888 RETVAL 2074 RETVAL
1889 2075
1890CHAINED 2076CHAINED
1891iow::stop () 2077pw::stop ()
1892 CODE: 2078 CODE:
1893 THIS->stop (); 2079 THIS->stop ();
1894 OUTPUT: 2080 OUTPUT:
1895 RETVAL 2081 RETVAL
1896 2082

Diff Legend

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