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.71 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.84 by root, Fri Jan 20 18:50:49 2006 UTC

… …
50#undef LINENO 50#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 52#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 53#define ROW(n) THIS->row_buf [LINENO (n)]
54 54
55#define ENABLE_PERL_FRILLS 1 55typedef int CHAINED UNUSED;
56 56
57///////////////////////////////////////////////////////////////////////////// 57/////////////////////////////////////////////////////////////////////////////
58 58
59static wchar_t * 59static wchar_t *
60sv2wcs (SV *sv) 60sv2wcs (SV *sv)
… …
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
120 120
121///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
122 122
123#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
124
123struct perl_watcher 125struct perl_watcher
124{ 126{
125 SV *cbsv; 127 SV *cbsv;
126 HV *self; 128 HV *self;
127 129
128 perl_watcher () 130 perl_watcher ()
129 : cbsv (newSV (0)) 131 : cbsv (0)
130 { 132 {
131 } 133 }
132 134
133 ~perl_watcher () 135 ~perl_watcher ()
134 { 136 {
135 SvREFCNT_dec (cbsv); 137 SvREFCNT_dec (cbsv);
136 } 138 }
137 139
138 void cb (SV *cb) 140 void cb (SV *cb)
139 { 141 {
140 sv_setsv (cbsv, cb); 142 SvREFCNT_dec (cbsv);
143 cbsv = newSVsv (cb);
141 } 144 }
142 145
143 void invoke (const char *type, SV *self, int arg = -1); 146 void invoke (const char *type, SV *self, int arg = -1);
144}; 147};
145 148
… …
169 if (SvTRUE (ERRSV)) 172 if (SvTRUE (ERRSV))
170 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 173 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
171} 174}
172 175
173#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 176#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
174#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 177#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
175 178
176struct timer : time_watcher, perl_watcher 179struct timer : perl_watcher, time_watcher
177{ 180{
178 tstamp interval; 181 tstamp interval;
179 182
180 timer () 183 timer ()
181 : time_watcher (this, &timer::execute) 184 : time_watcher (this, &timer::execute)
… …
190 invoke ("urxvt::timer", newSVtimer (this)); 193 invoke ("urxvt::timer", newSVtimer (this));
191 } 194 }
192}; 195};
193 196
194#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 197#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
195#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 198#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
196 199
197struct iow : io_watcher, perl_watcher 200struct iow : perl_watcher, io_watcher
198{ 201{
199 iow () 202 iow ()
200 : io_watcher (this, &iow::execute) 203 : io_watcher (this, &iow::execute)
201 { 204 {
202 } 205 }
… …
205 { 208 {
206 invoke ("urxvt::iow", newSViow (this), revents); 209 invoke ("urxvt::iow", newSViow (this), revents);
207 } 210 }
208}; 211};
209 212
213#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
214#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
215
216struct iw : perl_watcher, idle_watcher
217{
218 iw ()
219 : idle_watcher (this, &iw::execute)
220 {
221 }
222
223 void execute (idle_watcher &w)
224 {
225 invoke ("urxvt::iw", newSViw (this));
226 }
227};
228
229#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
230#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
231
232struct pw : perl_watcher, child_watcher
233{
234 pw ()
235 : child_watcher (this, &pw::execute)
236 {
237 }
238
239 void execute (child_watcher &w, int status)
240 {
241 invoke ("urxvt::pw", newSVpw (this), status);
242 }
243};
244
210///////////////////////////////////////////////////////////////////////////// 245/////////////////////////////////////////////////////////////////////////////
211 246
212#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 247#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
213 248
214struct overlay { 249struct overlay {
215 HV *self; 250 HV *self;
251 bool visible;
216 rxvt_term *THIS; 252 rxvt_term *THIS;
217 int x, y, w, h; 253 int x, y, w, h;
218 int border; 254 int border;
219 text_t **text; 255 text_t **text;
220 rend_t **rend; 256 rend_t **rend;
… …
229 265
230 void set (int x, int y, SV *str, SV *rend); 266 void set (int x, int y, SV *str, SV *rend);
231}; 267};
232 268
233overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 269overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
234: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) 270: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false)
235{ 271{
236 if (border == 2) 272 if (border == 2)
237 { 273 {
238 w += 2; 274 w += 2;
239 h += 2; 275 h += 2;
… …
300} 336}
301 337
302void 338void
303overlay::show () 339overlay::show ()
304{ 340{
305 char key[33]; sprintf (key, "%32lx", (long)this); 341 if (visible)
342 return;
306 343
344 visible = true;
345
307 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)); 346 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
308 hv_store (hv, key, 32, newSViv ((long)this), 0); 347 av_push (av, newSViv ((long)this));
309} 348}
310 349
311void 350void
312overlay::hide () 351overlay::hide ()
313{ 352{
353 if (!visible)
354 return;
355
356 visible = false;
357
314 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 358 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
315 359
316 if (ovs) 360 int i;
361
362 for (i = AvFILL (av); i >= 0; i--)
363 if (SvIV (*av_fetch (av, i, 1)) == (long)this)
317 { 364 {
318 char key[33]; sprintf (key, "%32lx", (long)this);
319
320 HV *hv = (HV *)SvRV (*ovs);
321 hv_delete (hv, key, 32, G_DISCARD); 365 av_delete (av, i, G_DISCARD);
366 break;
322 } 367 }
368
369 for (; i < AvFILL (av); i++)
370 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
371
372 av_pop (av);
323} 373}
324 374
325void overlay::swap () 375void overlay::swap ()
326{ 376{
327 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 377 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
367 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 417 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
368 croak ("rend must be arrayref"); 418 croak ("rend must be arrayref");
369 419
370 AV *av = (AV *)SvRV (rend); 420 AV *av = (AV *)SvRV (rend);
371 421
372 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 422 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
373 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 423 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
374 } 424 }
375 425
376 THIS->want_refresh = 1; 426 THIS->want_refresh = 1;
377} 427}
… …
402 perl_environ = rxvt_environ; 452 perl_environ = rxvt_environ;
403 swap (perl_environ, environ); 453 swap (perl_environ, environ);
404 454
405 char *argv[] = { 455 char *argv[] = {
406 "", 456 "",
407 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 457 "-e"
458 "BEGIN {"
459 " urxvt->bootstrap;"
460 " unshift @INC, '" LIBDIR "';"
461 "}"
462 ""
463 "use urxvt;"
408 }; 464 };
409 465
410 perl = perl_alloc (); 466 perl = perl_alloc ();
411 perl_construct (perl); 467 perl_construct (perl);
412 468
… …
427 483
428 if (perl) 484 if (perl)
429 { 485 {
430 // runs outside of perls ENV 486 // runs outside of perls ENV
431 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 487 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
432 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 488 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
433 } 489 }
434} 490}
435 491
436static void 492static void
437ungrab (rxvt_term *THIS) 493ungrab (rxvt_term *THIS)
… …
442 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 498 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
443 THIS->perl.grabtime = 0; 499 THIS->perl.grabtime = 0;
444 } 500 }
445} 501}
446 502
447static void
448swap_overlays (rxvt_term *term)
449{
450 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
451
452 if (HvKEYS (hv))
453 {
454 hv_iterinit (hv);
455
456 while (HE *he = hv_iternext (hv))
457 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
458 }
459}
460
461bool 503bool
462rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 504rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
463{ 505{
464 if (!perl || !term->perl.self) 506 if (!perl || !term->perl.self)
465 return false; 507 return false;
466 508
467 // pre-handling of some events 509 // pre-handling of some events
468 if (htype == HOOK_REFRESH_END) 510 if (htype == HOOK_REFRESH_END)
469 swap_overlays (term); 511 {
512 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
513
514 for (int i = 0; i <= AvFILL (av); i++)
515 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
516 }
470 517
471 swap (perl_environ, environ); 518 swap (perl_environ, environ);
472 519
473 bool event_consumed; 520 bool event_consumed;
474 521
… …
529 XEvent *xe = va_arg (ap, XEvent *); 576 XEvent *xe = va_arg (ap, XEvent *);
530 HV *hv = newHV (); 577 HV *hv = newHV ();
531 578
532# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 579# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
533# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 580# 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)
534# undef set 582# undef set
535 583
536 setiv (type, xe->type); 584 setiv (type, xe->type);
537 setiv (send_event, xe->xany.send_event); 585 setiv (send_event, xe->xany.send_event);
538 setiv (serial, xe->xany.serial); 586 setiv (serial, xe->xany.serial);
… …
542 case KeyPress: 590 case KeyPress:
543 case KeyRelease: 591 case KeyRelease:
544 case ButtonPress: 592 case ButtonPress:
545 case ButtonRelease: 593 case ButtonRelease:
546 case MotionNotify: 594 case MotionNotify:
595 setuv (window, xe->xmotion.window);
596 setuv (root, xe->xmotion.root);
597 setuv (subwindow, xe->xmotion.subwindow);
547 setiv (time, xe->xmotion.time); 598 setuv (time, xe->xmotion.time);
548 setiv (x, xe->xmotion.x); 599 setiv (x, xe->xmotion.x);
549 setiv (y, xe->xmotion.y); 600 setiv (y, xe->xmotion.y);
550 setiv (row, xe->xmotion.y / term->fheight); 601 setiv (row, xe->xmotion.y / term->fheight);
551 setiv (col, xe->xmotion.x / term->fwidth); 602 setiv (col, xe->xmotion.x / term->fwidth);
552 setiv (x_root, xe->xmotion.x_root); 603 setiv (x_root, xe->xmotion.x_root);
553 setiv (y_root, xe->xmotion.y_root); 604 setiv (y_root, xe->xmotion.y_root);
554 setiv (state, xe->xmotion.state); 605 setuv (state, xe->xmotion.state);
606
607 switch (xe->type)
608 {
609 case KeyPress:
610 case KeyRelease:
611 setuv (keycode, xe->xkey.keycode);
612 break;
613
614 case ButtonPress:
615 case ButtonRelease:
616 setuv (button, xe->xbutton.button);
617 break;
618
619 case MotionNotify:
620 setiv (is_hint, xe->xmotion.is_hint);
621 break;
622 }
623
555 break; 624 break;
556 }
557 625
626 case MapNotify:
627 case UnmapNotify:
628 case ConfigureNotify:
629 setuv (event, xe->xconfigure.event);
630 setuv (window, xe->xconfigure.window);
631
558 switch (xe->type) 632 switch (xe->type)
559 { 633 {
560 case KeyPress: 634 case ConfigureNotify:
561 case KeyRelease: 635 setiv (x, xe->xconfigure.x);
562 setiv (keycode, xe->xkey.keycode); 636 setiv (y, xe->xconfigure.y);
637 setiv (width, xe->xconfigure.width);
638 setiv (height, xe->xconfigure.height);
639 setuv (above, xe->xconfigure.above);
640 break;
641 }
642
563 break; 643 break;
564 644
565 case ButtonPress: 645 case PropertyNotify:
566 case ButtonRelease: 646 setuv (window, xe->xproperty.window);
567 setiv (button, xe->xbutton.button); 647 setuv (atom, xe->xproperty.atom);
648 setuv (time, xe->xproperty.time);
649 setiv (state, xe->xproperty.state);
568 break; 650 break;
569 651
570 case MotionNotify: 652 case ClientMessage:
571 setiv (is_hint, xe->xmotion.is_hint); 653 setuv (window, xe->xclient.window);
654 setuv (message_type, xe->xclient.message_type);
655 setuv (format, xe->xclient.format);
656 setuv (l0, xe->xclient.data.l[0]);
657 setuv (l1, xe->xclient.data.l[1]);
658 setuv (l2, xe->xclient.data.l[2]);
659 setuv (l3, xe->xclient.data.l[3]);
660 setuv (l4, xe->xclient.data.l[4]);
572 break; 661 break;
573 } 662 }
574 663
575 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 664 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
576 } 665 }
… …
617 else 706 else
618 event_consumed = false; 707 event_consumed = false;
619 708
620 // post-handling of some events 709 // post-handling of some events
621 if (htype == HOOK_REFRESH_BEGIN) 710 if (htype == HOOK_REFRESH_BEGIN)
622 swap_overlays (term); 711 {
712 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
713
714 for (int i = AvFILL (av); i >= 0; i--)
715 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
716 }
623 else if (htype == HOOK_DESTROY) 717 else if (htype == HOOK_DESTROY)
624 { 718 {
625 clearSVptr ((SV *)term->perl.self); 719 clearSVptr ((SV *)term->perl.self);
626 SvREFCNT_dec ((SV *)term->perl.self); 720 SvREFCNT_dec ((SV *)term->perl.self);
627 } 721 }
… …
841 935
842 for (int i = 1; i < items; i++) 936 for (int i = 1; i < items; i++)
843 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 937 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
844 938
845 AV *envv = (AV *)SvRV (ST (0)); 939 AV *envv = (AV *)SvRV (ST (0));
846 for (int i = av_len (envv) + 1; i--; ) 940 for (int i = AvFILL (envv) + 1; i--; )
847 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 941 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
848 942
849 term->envv->push_back (0); 943 term->envv->push_back (0);
850 944
851 bool success; 945 bool success;
… …
872 RETVAL 966 RETVAL
873 967
874void 968void
875rxvt_term::destroy () 969rxvt_term::destroy ()
876 970
877#if ENABLE_PERL_FRILLS
878
879void
880rxvt_term::XListProperties (U32 window)
881 PPCODE:
882{
883 int count;
884 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
885
886 EXTEND (SP, count);
887 while (count--)
888 PUSHs (newSVuv ((U32)props [count]));
889
890 XFree (props);
891}
892
893void
894rxvt_term::XGetWindowProperty (U32 window, U32 property)
895 PPCODE:
896{
897 Atom type;
898 int format;
899 unsigned long nitems;
900 unsigned long bytes_after;
901 unsigned char *prop;
902 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
903 0, 1<<30, 0, AnyPropertyType,
904 &type, &format, &nitems, &bytes_after, &prop);
905 if (type != None)
906 {
907 EXTEND (SP, 3);
908 PUSHs (newSVuv ((U32)type));
909 PUSHs (newSViv (format));
910 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
911 XFree (prop);
912 }
913}
914
915void
916rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
917 CODE:
918{
919 STRLEN len;
920 char *data_ = SvPVbyte (data, len);
921
922 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
923 type, format, PropModeReplace,
924 (unsigned char *)data, len * 8 / format);
925}
926
927void
928rxvt_term::XDeleteProperty (U32 window, U32 property)
929 CODE:
930 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
931
932U32
933rxvt_term::DefaultRootWindow ()
934 CODE:
935 RETVAL = (U32)THIS->display->root;
936 OUTPUT:
937 RETVAL
938
939U32
940rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
941 CODE:
942 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
943 x, y, width, height, 0,
944 THIS->pix_colors_focused[Color_border],
945 THIS->pix_colors_focused[Color_border]);
946 OUTPUT:
947 RETVAL
948
949void
950rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
951 CODE:
952 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
953
954void
955rxvt_term::XMapWindow (U32 window)
956 CODE:
957 XMapWindow (THIS->display->display, (Window)window);
958
959void
960rxvt_term::XUnmapWindow (U32 window)
961 CODE:
962 XUnmapWindow (THIS->display->display, (Window)window);
963
964#endif
965
966void 971void
967rxvt_term::set_should_invoke (int htype, int inc) 972rxvt_term::set_should_invoke (int htype, int inc)
968 CODE: 973 CODE:
969 THIS->perl.should_invoke [htype] += inc; 974 THIS->perl.should_invoke [htype] += inc;
970 975
… …
974 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 979 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
975 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 980 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
976 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 981 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
977 982
978bool 983bool
979rxvt_term::grab (U32 eventtime, int sync = 0) 984rxvt_term::grab (Time eventtime, int sync = 0)
980 CODE: 985 CODE:
981{ 986{
982 int mode = sync ? GrabModeSync : GrabModeAsync; 987 int mode = sync ? GrabModeSync : GrabModeAsync;
983 988
984 THIS->perl.grabtime = 0; 989 THIS->perl.grabtime = 0;
… …
1076#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1081#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1077#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1082#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1078#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1083#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1079#define TERM_OFFSET_focus TERM_OFFSET(focus) 1084#define TERM_OFFSET_focus TERM_OFFSET(focus)
1080#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1085#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1086#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1087#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1088#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1081#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1089#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1082#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1090#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1083#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1091#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1084 1092
1085int 1093int
… …
1092 fbase = TERM_OFFSET_fbase 1100 fbase = TERM_OFFSET_fbase
1093 nrow = TERM_OFFSET_nrow 1101 nrow = TERM_OFFSET_nrow
1094 ncol = TERM_OFFSET_ncol 1102 ncol = TERM_OFFSET_ncol
1095 focus = TERM_OFFSET_focus 1103 focus = TERM_OFFSET_focus
1096 mapped = TERM_OFFSET_mapped 1104 mapped = TERM_OFFSET_mapped
1105 int_bwidth = TERM_OFFSET_int_bwidth
1106 ext_bwidth = TERM_OFFSET_ext_bwidth
1107 lineSpace = TERM_OFFSET_lineSpace
1097 saveLines = TERM_OFFSET_saveLines 1108 saveLines = TERM_OFFSET_saveLines
1098 total_rows = TERM_OFFSET_total_rows 1109 total_rows = TERM_OFFSET_total_rows
1099 top_row = TERM_OFFSET_top_row 1110 top_row = TERM_OFFSET_top_row
1100 CODE: 1111 CODE:
1101 RETVAL = *(int *)((char *)THIS + ix); 1112 RETVAL = *(int *)((char *)THIS + ix);
… …
1159 if (events != EVENT_UNDEF) 1170 if (events != EVENT_UNDEF)
1160 THIS->pty_ev.set (events); 1171 THIS->pty_ev.set (events);
1161 OUTPUT: 1172 OUTPUT:
1162 RETVAL 1173 RETVAL
1163 1174
1164U32 1175Window
1165rxvt_term::parent () 1176rxvt_term::parent ()
1166 CODE: 1177 CODE:
1167 RETVAL = (U32)THIS->parent [0]; 1178 RETVAL = THIS->parent [0];
1168 OUTPUT: 1179 OUTPUT:
1169 RETVAL 1180 RETVAL
1170 1181
1171U32 1182Window
1172rxvt_term::vt () 1183rxvt_term::vt ()
1173 CODE: 1184 CODE:
1174 RETVAL = (U32)THIS->vt; 1185 RETVAL = THIS->vt;
1175 OUTPUT: 1186 OUTPUT:
1176 RETVAL 1187 RETVAL
1177 1188
1178void 1189void
1179rxvt_term::vt_emask_add (U32 emask) 1190rxvt_term::vt_emask_add (U32 emask)
… …
1201} 1212}
1202 OUTPUT: 1213 OUTPUT:
1203 RETVAL 1214 RETVAL
1204 1215
1205void 1216void
1217rxvt_term::focus_in ()
1218
1219void
1220rxvt_term::focus_out ()
1221
1222void
1206rxvt_term::want_refresh () 1223rxvt_term::want_refresh ()
1207 CODE: 1224 CODE:
1208 THIS->want_refresh = 1; 1225 THIS->want_refresh = 1;
1209 1226
1210void 1227void
… …
1232 { 1249 {
1233 wchar_t *wstr = sv2wcs (new_text); 1250 wchar_t *wstr = sv2wcs (new_text);
1234 1251
1235 int len = min (wcslen (wstr) - start_ofs, max_len); 1252 int len = min (wcslen (wstr) - start_ofs, max_len);
1236 1253
1237 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1254 if (start_col < 0 || start_col + len > THIS->ncol)
1238 { 1255 {
1239 free (wstr); 1256 free (wstr);
1240 croak ("new_text extends beyond horizontal margins"); 1257 croak ("new_text extends beyond horizontal margins");
1241 } 1258 }
1242 1259
… …
1274 { 1291 {
1275 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1292 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1276 croak ("new_rend must be arrayref"); 1293 croak ("new_rend must be arrayref");
1277 1294
1278 AV *av = (AV *)SvRV (new_rend); 1295 AV *av = (AV *)SvRV (new_rend);
1279 int len = min (av_len (av) + 1 - start_ofs, max_len); 1296 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1280 1297
1281 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1298 if (start_col < 0 || start_col + len > THIS->ncol)
1282 croak ("new_rend array extends beyond horizontal margins"); 1299 croak ("new_rend array extends beyond horizontal margins");
1283 1300
1284 for (int col = start_col; col < start_col + len; col++) 1301 for (int col = start_col; col < start_col + len; col++)
1285 { 1302 {
1286 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1303 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
… …
1451 if (set) 1468 if (set)
1452 THIS->options |= optval; 1469 THIS->options |= optval;
1453 else 1470 else
1454 THIS->options &= ~optval; 1471 THIS->options &= ~optval;
1455 1472
1473 if (THIS->check_ev.is_active ()) // avoid doing this before START
1456 switch (optval) 1474 switch (optval)
1457 { 1475 {
1458 case Opt_skipBuiltinGlyphs: 1476 case Opt_skipBuiltinGlyphs:
1459 THIS->set_fonts (); 1477 THIS->set_fonts ();
1460 THIS->scr_remap_chars (); 1478 THIS->scr_remap_chars ();
1461 THIS->scr_touch (true); 1479 THIS->scr_touch (true);
1462 THIS->want_refresh = 1; 1480 THIS->want_refresh = 1;
1463 break; 1481 break;
1464 1482
1465 case Opt_cursorUnderline: 1483 case Opt_cursorUnderline:
1466 THIS->want_refresh = 1; 1484 THIS->want_refresh = 1;
1467 break; 1485 break;
1468 1486
1469# case Opt_scrollBar_floating: 1487# case Opt_scrollBar_floating:
1470# case Opt_scrollBar_right: 1488# case Opt_scrollBar_right:
1471# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1489# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1472# break; 1490# break;
1473 } 1491 }
1474 } 1492 }
1475} 1493}
1476 OUTPUT: 1494 OUTPUT:
1477 RETVAL 1495 RETVAL
1478 1496
… …
1506 PUSHs (sv_2mortal (newSViv (rc.col))); 1524 PUSHs (sv_2mortal (newSViv (rc.col)));
1507 } 1525 }
1508 1526
1509 if (items == 3) 1527 if (items == 3)
1510 { 1528 {
1529 rc.row = SvIV (ST (1));
1530 rc.col = SvIV (ST (2));
1531
1532 if (ix == 2 && rc.col == 0)
1533 {
1534 rc.row--;
1535 rc.col = THIS->ncol;
1536 }
1537
1538 clamp_it (rc.col, 0, THIS->ncol);
1511 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); 1539 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1512 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1513 1540
1514 if (ix) 1541 if (ix)
1515 THIS->want_refresh = 1; 1542 THIS->want_refresh = 1;
1516 } 1543 }
1517} 1544}
… …
1525 1552
1526#void 1553#void
1527#rxvt_term::selection_clear () 1554#rxvt_term::selection_clear ()
1528 1555
1529void 1556void
1530rxvt_term::selection_make (U32 eventtime, bool rect = false) 1557rxvt_term::selection_make (Time eventtime, bool rect = false)
1531 CODE: 1558 CODE:
1532 THIS->selection.op = SELECTION_CONT; 1559 THIS->selection.op = SELECTION_CONT;
1533 THIS->selection.rect = rect; 1560 THIS->selection.rect = rect;
1534 THIS->selection_make (eventtime); 1561 THIS->selection_make (eventtime);
1535 1562
1536int 1563int
1537rxvt_term::selection_grab (U32 eventtime) 1564rxvt_term::selection_grab (Time eventtime)
1538 1565
1539void 1566void
1540rxvt_term::selection (SV *newtext = 0) 1567rxvt_term::selection (SV *newtext = 0)
1541 PPCODE: 1568 PPCODE:
1542{ 1569{
… …
1610 o->self = (HV *)SvRV (RETVAL); 1637 o->self = (HV *)SvRV (RETVAL);
1611} 1638}
1612 OUTPUT: 1639 OUTPUT:
1613 RETVAL 1640 RETVAL
1614 1641
1642#############################################################################
1643# Various X Utility Functions
1644#############################################################################
1645
1646void
1647rxvt_term::XListProperties (Window window)
1648 PPCODE:
1649{
1650 int count;
1651 Atom *props = XListProperties (THIS->display->display, window, &count);
1652
1653 EXTEND (SP, count);
1654 while (count--)
1655 PUSHs (newSVuv ((U32)props [count]));
1656
1657 XFree (props);
1658}
1659
1660void
1661rxvt_term::XGetWindowProperty (Window window, Atom property)
1662 PPCODE:
1663{
1664 Atom type;
1665 int format;
1666 unsigned long nitems;
1667 unsigned long bytes_after;
1668 unsigned char *prop;
1669
1670 XGetWindowProperty (THIS->display->display, window, property,
1671 0, 1<<24, 0, AnyPropertyType,
1672 &type, &format, &nitems, &bytes_after, &prop);
1673
1674 if (type != None)
1675 {
1676 int elemsize = format == 16 ? sizeof (short)
1677 : format == 32 ? sizeof (long)
1678 : 1;
1679
1680 EXTEND (SP, 3);
1681 PUSHs (newSVuv ((U32)type));
1682 PUSHs (newSViv (format));
1683 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1684 XFree (prop);
1685 }
1686}
1687
1688void
1689rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1690 CODE:
1691{
1692 STRLEN len;
1693 char *data_ = SvPVbyte (data, len);
1694
1695 int elemsize = format == 16 ? sizeof (short)
1696 : format == 32 ? sizeof (long)
1697 : 1;
1698
1699 XChangeProperty (THIS->display->display, window, property,
1700 type, format, PropModeReplace,
1701 (unsigned char *)data_, len / elemsize);
1702 XSync (THIS->display->display, 0);
1703}
1704
1705Atom
1706XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1707 C_ARGS: term->display->display, atom_name, only_if_exists
1708
1709char *
1710XGetAtomName (rxvt_term *term, Atom atom)
1711 C_ARGS: term->display->display, atom
1712 CLEANUP:
1713 XFree (RETVAL);
1714
1715void
1716XDeleteProperty (rxvt_term *term, Window window, Atom property)
1717 C_ARGS: term->display->display, window, property
1718
1719Window
1720rxvt_term::DefaultRootWindow ()
1721 CODE:
1722 RETVAL = THIS->display->root;
1723 OUTPUT:
1724 RETVAL
1725
1726#if 0
1727
1728Window
1729XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1730 C_ARGS: term->display->display, (Window)parent,
1731 x, y, width, height, 0,
1732 term->pix_colors_focused[Color_border],
1733 term->pix_colors_focused[Color_border]
1734
1735#endif
1736
1737void
1738XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1739 C_ARGS: term->display->display, window, parent, x, y
1740
1741void
1742XMapWindow (rxvt_term *term, Window window)
1743 C_ARGS: term->display->display, window
1744
1745void
1746XUnmapWindow (rxvt_term *term, Window window)
1747 C_ARGS: term->display->display, window
1748
1749void
1750XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1751 C_ARGS: term->display->display, window, x, y, width, height
1752
1753void
1754rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1755 CODE:
1756{
1757 XWindowAttributes attr;
1758 XGetWindowAttributes (THIS->display->display, window, &attr);
1759 XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
1760}
1761
1762void
1763rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1764 PPCODE:
1765{
1766 int dx, dy;
1767 Window child;
1768
1769 if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
1770 {
1771 EXTEND (SP, 3);
1772 PUSHs (newSViv (dx));
1773 PUSHs (newSViv (dy));
1774 PUSHs (newSVuv (child));
1775 }
1776}
1777
1778#############################################################################
1779# urxvt::overlay
1780#############################################################################
1781
1615MODULE = urxvt PACKAGE = urxvt::overlay 1782MODULE = urxvt PACKAGE = urxvt::overlay
1616 1783
1617void 1784void
1618overlay::set (int x, int y, SV *text, SV *rend = 0) 1785overlay::set (int x, int y, SV *text, SV *rend = 0)
1619 1786
… …
1623void 1790void
1624overlay::hide () 1791overlay::hide ()
1625 1792
1626void 1793void
1627overlay::DESTROY () 1794overlay::DESTROY ()
1795
1796#############################################################################
1797# urxvt::watcher
1798#############################################################################
1799
1800MODULE = urxvt PACKAGE = urxvt::watcher
1801
1802CHAINED
1803perl_watcher::cb (SV *cb)
1804 CODE:
1805 THIS->cb (cb);
1806 OUTPUT:
1807 RETVAL
1808
1809#############################################################################
1810# urxvt::timer
1811#############################################################################
1628 1812
1629MODULE = urxvt PACKAGE = urxvt::timer 1813MODULE = urxvt PACKAGE = urxvt::timer
1630 1814
1631SV * 1815SV *
1632timer::new () 1816timer::new ()
1633 CODE: 1817 CODE:
1634 timer *w = new timer; 1818 timer *w = new timer;
1635 w->start (NOW); 1819 w->start (NOW);
1636 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1820 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1637 w->self = (HV *)SvRV (RETVAL); 1821 w->self = (HV *)SvRV (RETVAL);
1638 OUTPUT:
1639 RETVAL
1640
1641timer *
1642timer::cb (SV *cb)
1643 CODE:
1644 THIS->cb (cb);
1645 RETVAL = THIS;
1646 OUTPUT: 1822 OUTPUT:
1647 RETVAL 1823 RETVAL
1648 1824
1649NV 1825NV
1650timer::at () 1826timer::at ()
1651 CODE: 1827 CODE:
1652 RETVAL = THIS->at; 1828 RETVAL = THIS->at;
1653 OUTPUT: 1829 OUTPUT:
1654 RETVAL 1830 RETVAL
1655 1831
1656timer * 1832CHAINED
1657timer::interval (NV interval) 1833timer::interval (NV interval)
1658 CODE: 1834 CODE:
1659 THIS->interval = interval; 1835 THIS->interval = interval;
1836 OUTPUT:
1660 RETVAL = THIS; 1837 RETVAL
1661 OUTPUT:
1662 RETVAL
1663 1838
1664timer * 1839CHAINED
1665timer::set (NV tstamp) 1840timer::set (NV tstamp)
1666 CODE: 1841 CODE:
1667 THIS->set (tstamp); 1842 THIS->set (tstamp);
1843 OUTPUT:
1668 RETVAL = THIS; 1844 RETVAL
1669 OUTPUT:
1670 RETVAL
1671 1845
1672timer * 1846CHAINED
1673timer::start (NV tstamp = THIS->at) 1847timer::start (NV tstamp = THIS->at)
1674 CODE: 1848 CODE:
1675 THIS->start (tstamp); 1849 THIS->start (tstamp);
1850 OUTPUT:
1676 RETVAL = THIS; 1851 RETVAL
1677 OUTPUT:
1678 RETVAL
1679 1852
1680timer * 1853CHAINED
1854timer::after (NV delay)
1855 CODE:
1856 THIS->start (NOW + delay);
1857 OUTPUT:
1858 RETVAL
1859
1860CHAINED
1681timer::stop () 1861timer::stop ()
1682 CODE: 1862 CODE:
1683 THIS->stop (); 1863 THIS->stop ();
1684 RETVAL = THIS;
1685 OUTPUT: 1864 OUTPUT:
1686 RETVAL 1865 RETVAL
1687 1866
1688void 1867void
1689timer::DESTROY () 1868timer::DESTROY ()
1869
1870#############################################################################
1871# urxvt::iow
1872#############################################################################
1690 1873
1691MODULE = urxvt PACKAGE = urxvt::iow 1874MODULE = urxvt PACKAGE = urxvt::iow
1692 1875
1693SV * 1876SV *
1694iow::new () 1877iow::new ()
1695 CODE: 1878 CODE:
1696 iow *w = new iow; 1879 iow *w = new iow;
1697 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1880 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1698 w->self = (HV *)SvRV (RETVAL); 1881 w->self = (HV *)SvRV (RETVAL);
1699 OUTPUT: 1882 OUTPUT:
1700 RETVAL 1883 RETVAL
1701 1884
1702iow * 1885CHAINED
1703iow::cb (SV *cb)
1704 CODE:
1705 THIS->cb (cb);
1706 RETVAL = THIS;
1707 OUTPUT:
1708 RETVAL
1709
1710iow *
1711iow::fd (int fd) 1886iow::fd (int fd)
1712 CODE: 1887 CODE:
1713 THIS->fd = fd; 1888 THIS->fd = fd;
1889 OUTPUT:
1714 RETVAL = THIS; 1890 RETVAL
1715 OUTPUT:
1716 RETVAL
1717 1891
1718iow * 1892CHAINED
1719iow::events (short events) 1893iow::events (short events)
1720 CODE: 1894 CODE:
1721 THIS->events = events; 1895 THIS->events = events;
1896 OUTPUT:
1722 RETVAL = THIS; 1897 RETVAL
1723 OUTPUT:
1724 RETVAL
1725 1898
1726iow * 1899CHAINED
1727iow::start () 1900iow::start ()
1728 CODE: 1901 CODE:
1729 THIS->start (); 1902 THIS->start ();
1903 OUTPUT:
1730 RETVAL = THIS; 1904 RETVAL
1731 OUTPUT:
1732 RETVAL
1733 1905
1734iow * 1906CHAINED
1735iow::stop () 1907iow::stop ()
1736 CODE: 1908 CODE:
1737 THIS->stop (); 1909 THIS->stop ();
1738 RETVAL = THIS;
1739 OUTPUT: 1910 OUTPUT:
1740 RETVAL 1911 RETVAL
1741 1912
1742void 1913void
1743iow::DESTROY () 1914iow::DESTROY ()
1744 1915
1916#############################################################################
1917# urxvt::iw
1918#############################################################################
1745 1919
1920MODULE = urxvt PACKAGE = urxvt::iw
1921
1922SV *
1923iw::new ()
1924 CODE:
1925 iw *w = new iw;
1926 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1927 w->self = (HV *)SvRV (RETVAL);
1928 OUTPUT:
1929 RETVAL
1930
1931CHAINED
1932iw::start ()
1933 CODE:
1934 THIS->start ();
1935 OUTPUT:
1936 RETVAL
1937
1938CHAINED
1939iw::stop ()
1940 CODE:
1941 THIS->stop ();
1942 OUTPUT:
1943 RETVAL
1944
1945void
1946iw::DESTROY ()
1947
1948#############################################################################
1949# urxvt::pw
1950#############################################################################
1951
1952MODULE = urxvt PACKAGE = urxvt::pw
1953
1954SV *
1955pw::new ()
1956 CODE:
1957 pw *w = new pw;
1958 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1959 w->self = (HV *)SvRV (RETVAL);
1960 OUTPUT:
1961 RETVAL
1962
1963CHAINED
1964pw::start (int pid)
1965 CODE:
1966 THIS->start (pid);
1967 OUTPUT:
1968 RETVAL
1969
1970CHAINED
1971pw::stop ()
1972 CODE:
1973 THIS->stop ();
1974 OUTPUT:
1975 RETVAL
1976
1977void
1978pw::DESTROY ()
1979
1980

Diff Legend

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