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.79 by root, Fri Jan 20 10:27:08 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);
563 break; 640 break;
564
565 case ButtonPress:
566 case ButtonRelease:
567 setiv (button, xe->xbutton.button);
568 break; 641 }
569 642
570 case MotionNotify:
571 setiv (is_hint, xe->xmotion.is_hint);
572 break; 643 break;
573 } 644 }
574 645
575 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 646 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
576 } 647 }
… …
617 else 688 else
618 event_consumed = false; 689 event_consumed = false;
619 690
620 // post-handling of some events 691 // post-handling of some events
621 if (htype == HOOK_REFRESH_BEGIN) 692 if (htype == HOOK_REFRESH_BEGIN)
622 swap_overlays (term); 693 {
694 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
695
696 for (int i = AvFILL (av); i >= 0; i--)
697 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
698 }
623 else if (htype == HOOK_DESTROY) 699 else if (htype == HOOK_DESTROY)
624 { 700 {
625 clearSVptr ((SV *)term->perl.self); 701 clearSVptr ((SV *)term->perl.self);
626 SvREFCNT_dec ((SV *)term->perl.self); 702 SvREFCNT_dec ((SV *)term->perl.self);
627 } 703 }
… …
841 917
842 for (int i = 1; i < items; i++) 918 for (int i = 1; i < items; i++)
843 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 919 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
844 920
845 AV *envv = (AV *)SvRV (ST (0)); 921 AV *envv = (AV *)SvRV (ST (0));
846 for (int i = av_len (envv) + 1; i--; ) 922 for (int i = AvFILL (envv) + 1; i--; )
847 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 923 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
848 924
849 term->envv->push_back (0); 925 term->envv->push_back (0);
850 926
851 bool success; 927 bool success;
… …
872 RETVAL 948 RETVAL
873 949
874void 950void
875rxvt_term::destroy () 951rxvt_term::destroy ()
876 952
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 953void
967rxvt_term::set_should_invoke (int htype, int inc) 954rxvt_term::set_should_invoke (int htype, int inc)
968 CODE: 955 CODE:
969 THIS->perl.should_invoke [htype] += inc; 956 THIS->perl.should_invoke [htype] += inc;
970 957
… …
974 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 961 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
975 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 962 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
976 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 963 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
977 964
978bool 965bool
979rxvt_term::grab (U32 eventtime, int sync = 0) 966rxvt_term::grab (Time eventtime, int sync = 0)
980 CODE: 967 CODE:
981{ 968{
982 int mode = sync ? GrabModeSync : GrabModeAsync; 969 int mode = sync ? GrabModeSync : GrabModeAsync;
983 970
984 THIS->perl.grabtime = 0; 971 THIS->perl.grabtime = 0;
… …
1159 if (events != EVENT_UNDEF) 1146 if (events != EVENT_UNDEF)
1160 THIS->pty_ev.set (events); 1147 THIS->pty_ev.set (events);
1161 OUTPUT: 1148 OUTPUT:
1162 RETVAL 1149 RETVAL
1163 1150
1164U32 1151Window
1165rxvt_term::parent () 1152rxvt_term::parent ()
1166 CODE: 1153 CODE:
1167 RETVAL = (U32)THIS->parent [0]; 1154 RETVAL = THIS->parent [0];
1168 OUTPUT: 1155 OUTPUT:
1169 RETVAL 1156 RETVAL
1170 1157
1171U32 1158Window
1172rxvt_term::vt () 1159rxvt_term::vt ()
1173 CODE: 1160 CODE:
1174 RETVAL = (U32)THIS->vt; 1161 RETVAL = THIS->vt;
1175 OUTPUT: 1162 OUTPUT:
1176 RETVAL 1163 RETVAL
1177 1164
1178void 1165void
1179rxvt_term::vt_emask_add (U32 emask) 1166rxvt_term::vt_emask_add (U32 emask)
… …
1274 { 1261 {
1275 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1262 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1276 croak ("new_rend must be arrayref"); 1263 croak ("new_rend must be arrayref");
1277 1264
1278 AV *av = (AV *)SvRV (new_rend); 1265 AV *av = (AV *)SvRV (new_rend);
1279 int len = min (av_len (av) + 1 - start_ofs, max_len); 1266 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1280 1267
1281 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1268 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
1282 croak ("new_rend array extends beyond horizontal margins"); 1269 croak ("new_rend array extends beyond horizontal margins");
1283 1270
1284 for (int col = start_col; col < start_col + len; col++) 1271 for (int col = start_col; col < start_col + len; col++)
… …
1451 if (set) 1438 if (set)
1452 THIS->options |= optval; 1439 THIS->options |= optval;
1453 else 1440 else
1454 THIS->options &= ~optval; 1441 THIS->options &= ~optval;
1455 1442
1443 if (THIS->check_ev.is_active ()) // avoid doing this before START
1456 switch (optval) 1444 switch (optval)
1457 { 1445 {
1458 case Opt_skipBuiltinGlyphs: 1446 case Opt_skipBuiltinGlyphs:
1459 THIS->set_fonts (); 1447 THIS->set_fonts ();
1460 THIS->scr_remap_chars (); 1448 THIS->scr_remap_chars ();
1461 THIS->scr_touch (true); 1449 THIS->scr_touch (true);
1462 THIS->want_refresh = 1; 1450 THIS->want_refresh = 1;
1463 break; 1451 break;
1464 1452
1465 case Opt_cursorUnderline: 1453 case Opt_cursorUnderline:
1466 THIS->want_refresh = 1; 1454 THIS->want_refresh = 1;
1467 break; 1455 break;
1468 1456
1469# case Opt_scrollBar_floating: 1457# case Opt_scrollBar_floating:
1470# case Opt_scrollBar_right: 1458# case Opt_scrollBar_right:
1471# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1459# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1472# break; 1460# break;
1473 } 1461 }
1474 } 1462 }
1475} 1463}
1476 OUTPUT: 1464 OUTPUT:
1477 RETVAL 1465 RETVAL
1478 1466
… …
1506 PUSHs (sv_2mortal (newSViv (rc.col))); 1494 PUSHs (sv_2mortal (newSViv (rc.col)));
1507 } 1495 }
1508 1496
1509 if (items == 3) 1497 if (items == 3)
1510 { 1498 {
1499 rc.row = SvIV (ST (1));
1500 rc.col = SvIV (ST (2));
1501
1502 if (ix == 2 && rc.col == 0)
1503 {
1504 rc.row--;
1505 rc.col = THIS->ncol;
1506 }
1507
1508 clamp_it (rc.col, 0, THIS->ncol);
1511 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); 1509 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1512 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1513 1510
1514 if (ix) 1511 if (ix)
1515 THIS->want_refresh = 1; 1512 THIS->want_refresh = 1;
1516 } 1513 }
1517} 1514}
… …
1525 1522
1526#void 1523#void
1527#rxvt_term::selection_clear () 1524#rxvt_term::selection_clear ()
1528 1525
1529void 1526void
1530rxvt_term::selection_make (U32 eventtime, bool rect = false) 1527rxvt_term::selection_make (Time eventtime, bool rect = false)
1531 CODE: 1528 CODE:
1532 THIS->selection.op = SELECTION_CONT; 1529 THIS->selection.op = SELECTION_CONT;
1533 THIS->selection.rect = rect; 1530 THIS->selection.rect = rect;
1534 THIS->selection_make (eventtime); 1531 THIS->selection_make (eventtime);
1535 1532
1536int 1533int
1537rxvt_term::selection_grab (U32 eventtime) 1534rxvt_term::selection_grab (Time eventtime)
1538 1535
1539void 1536void
1540rxvt_term::selection (SV *newtext = 0) 1537rxvt_term::selection (SV *newtext = 0)
1541 PPCODE: 1538 PPCODE:
1542{ 1539{
… …
1610 o->self = (HV *)SvRV (RETVAL); 1607 o->self = (HV *)SvRV (RETVAL);
1611} 1608}
1612 OUTPUT: 1609 OUTPUT:
1613 RETVAL 1610 RETVAL
1614 1611
1612#############################################################################
1613# Various X Utility Functions
1614#############################################################################
1615
1616void
1617rxvt_term::XListProperties (Window window)
1618 PPCODE:
1619{
1620 int count;
1621 Atom *props = XListProperties (THIS->display->display, window, &count);
1622
1623 EXTEND (SP, count);
1624 while (count--)
1625 PUSHs (newSVuv ((U32)props [count]));
1626
1627 XFree (props);
1628}
1629
1630void
1631rxvt_term::XGetWindowProperty (Window window, Atom property)
1632 PPCODE:
1633{
1634 Atom type;
1635 int format;
1636 unsigned long nitems;
1637 unsigned long bytes_after;
1638 unsigned char *prop;
1639 XGetWindowProperty (THIS->display->display, window, property,
1640 0, 1<<30, 0, AnyPropertyType,
1641 &type, &format, &nitems, &bytes_after, &prop);
1642 if (type != None)
1643 {
1644 EXTEND (SP, 3);
1645 PUSHs (newSVuv ((U32)type));
1646 PUSHs (newSViv (format));
1647 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
1648 XFree (prop);
1649 }
1650}
1651
1652void
1653rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1654 CODE:
1655{
1656 STRLEN len;
1657 char *data_ = SvPVbyte (data, len);
1658
1659 XChangeProperty (THIS->display->display, window, property,
1660 type, format, PropModeReplace,
1661 (unsigned char *)data, len * 8 / format);
1662}
1663
1664void
1665XDeleteProperty (rxvt_term *term, Window window, Atom property)
1666 C_ARGS: term->display->display, window, property
1667
1668Window
1669rxvt_term::DefaultRootWindow ()
1670 CODE:
1671 RETVAL = THIS->display->root;
1672 OUTPUT:
1673 RETVAL
1674
1675Window
1676XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1677 C_ARGS: term->display->display, (Window)parent,
1678 x, y, width, height, 0,
1679 term->pix_colors_focused[Color_border],
1680 term->pix_colors_focused[Color_border]
1681
1682void
1683XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1684 C_ARGS: term->display->display, window, parent, x, y
1685
1686void
1687XMapWindow (rxvt_term *term, Window window)
1688 C_ARGS: term->display->display, window
1689
1690void
1691XUnmapWindow (rxvt_term *term, Window window)
1692 C_ARGS: term->display->display, window
1693
1694void
1695XMoveResizeWindow (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
1697
1698#############################################################################
1699# urxvt::overlay
1700#############################################################################
1701
1615MODULE = urxvt PACKAGE = urxvt::overlay 1702MODULE = urxvt PACKAGE = urxvt::overlay
1616 1703
1617void 1704void
1618overlay::set (int x, int y, SV *text, SV *rend = 0) 1705overlay::set (int x, int y, SV *text, SV *rend = 0)
1619 1706
… …
1623void 1710void
1624overlay::hide () 1711overlay::hide ()
1625 1712
1626void 1713void
1627overlay::DESTROY () 1714overlay::DESTROY ()
1715
1716#############################################################################
1717# urxvt::watcher
1718#############################################################################
1719
1720MODULE = urxvt PACKAGE = urxvt::watcher
1721
1722CHAINED
1723perl_watcher::cb (SV *cb)
1724 CODE:
1725 THIS->cb (cb);
1726 OUTPUT:
1727 RETVAL
1728
1729#############################################################################
1730# urxvt::timer
1731#############################################################################
1628 1732
1629MODULE = urxvt PACKAGE = urxvt::timer 1733MODULE = urxvt PACKAGE = urxvt::timer
1630 1734
1631SV * 1735SV *
1632timer::new () 1736timer::new ()
1633 CODE: 1737 CODE:
1634 timer *w = new timer; 1738 timer *w = new timer;
1635 w->start (NOW); 1739 w->start (NOW);
1636 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1740 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1637 w->self = (HV *)SvRV (RETVAL); 1741 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: 1742 OUTPUT:
1647 RETVAL 1743 RETVAL
1648 1744
1649NV 1745NV
1650timer::at () 1746timer::at ()
1651 CODE: 1747 CODE:
1652 RETVAL = THIS->at; 1748 RETVAL = THIS->at;
1653 OUTPUT: 1749 OUTPUT:
1654 RETVAL 1750 RETVAL
1655 1751
1656timer * 1752CHAINED
1657timer::interval (NV interval) 1753timer::interval (NV interval)
1658 CODE: 1754 CODE:
1659 THIS->interval = interval; 1755 THIS->interval = interval;
1756 OUTPUT:
1660 RETVAL = THIS; 1757 RETVAL
1661 OUTPUT:
1662 RETVAL
1663 1758
1664timer * 1759CHAINED
1665timer::set (NV tstamp) 1760timer::set (NV tstamp)
1666 CODE: 1761 CODE:
1667 THIS->set (tstamp); 1762 THIS->set (tstamp);
1763 OUTPUT:
1668 RETVAL = THIS; 1764 RETVAL
1669 OUTPUT:
1670 RETVAL
1671 1765
1672timer * 1766CHAINED
1673timer::start (NV tstamp = THIS->at) 1767timer::start (NV tstamp = THIS->at)
1674 CODE: 1768 CODE:
1675 THIS->start (tstamp); 1769 THIS->start (tstamp);
1770 OUTPUT:
1676 RETVAL = THIS; 1771 RETVAL
1677 OUTPUT:
1678 RETVAL
1679 1772
1680timer * 1773CHAINED
1774timer::after (NV delay)
1775 CODE:
1776 THIS->start (NOW + delay);
1777 OUTPUT:
1778 RETVAL
1779
1780CHAINED
1681timer::stop () 1781timer::stop ()
1682 CODE: 1782 CODE:
1683 THIS->stop (); 1783 THIS->stop ();
1684 RETVAL = THIS;
1685 OUTPUT: 1784 OUTPUT:
1686 RETVAL 1785 RETVAL
1687 1786
1688void 1787void
1689timer::DESTROY () 1788timer::DESTROY ()
1789
1790#############################################################################
1791# urxvt::iow
1792#############################################################################
1690 1793
1691MODULE = urxvt PACKAGE = urxvt::iow 1794MODULE = urxvt PACKAGE = urxvt::iow
1692 1795
1693SV * 1796SV *
1694iow::new () 1797iow::new ()
1695 CODE: 1798 CODE:
1696 iow *w = new iow; 1799 iow *w = new iow;
1697 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1800 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1698 w->self = (HV *)SvRV (RETVAL); 1801 w->self = (HV *)SvRV (RETVAL);
1699 OUTPUT: 1802 OUTPUT:
1700 RETVAL 1803 RETVAL
1701 1804
1702iow * 1805CHAINED
1703iow::cb (SV *cb)
1704 CODE:
1705 THIS->cb (cb);
1706 RETVAL = THIS;
1707 OUTPUT:
1708 RETVAL
1709
1710iow *
1711iow::fd (int fd) 1806iow::fd (int fd)
1712 CODE: 1807 CODE:
1713 THIS->fd = fd; 1808 THIS->fd = fd;
1809 OUTPUT:
1714 RETVAL = THIS; 1810 RETVAL
1715 OUTPUT:
1716 RETVAL
1717 1811
1718iow * 1812CHAINED
1719iow::events (short events) 1813iow::events (short events)
1720 CODE: 1814 CODE:
1721 THIS->events = events; 1815 THIS->events = events;
1816 OUTPUT:
1722 RETVAL = THIS; 1817 RETVAL
1723 OUTPUT:
1724 RETVAL
1725 1818
1726iow * 1819CHAINED
1727iow::start () 1820iow::start ()
1728 CODE: 1821 CODE:
1729 THIS->start (); 1822 THIS->start ();
1823 OUTPUT:
1730 RETVAL = THIS; 1824 RETVAL
1731 OUTPUT:
1732 RETVAL
1733 1825
1734iow * 1826CHAINED
1735iow::stop () 1827iow::stop ()
1736 CODE: 1828 CODE:
1737 THIS->stop (); 1829 THIS->stop ();
1738 RETVAL = THIS;
1739 OUTPUT: 1830 OUTPUT:
1740 RETVAL 1831 RETVAL
1741 1832
1742void 1833void
1743iow::DESTROY () 1834iow::DESTROY ()
1744 1835
1836#############################################################################
1837# urxvt::iw
1838#############################################################################
1745 1839
1840MODULE = urxvt PACKAGE = urxvt::iw
1841
1842SV *
1843iw::new ()
1844 CODE:
1845 iw *w = new iw;
1846 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
1847 w->self = (HV *)SvRV (RETVAL);
1848 OUTPUT:
1849 RETVAL
1850
1851CHAINED
1852iow::start ()
1853 CODE:
1854 THIS->start ();
1855 OUTPUT:
1856 RETVAL
1857
1858CHAINED
1859iow::stop ()
1860 CODE:
1861 THIS->stop ();
1862 OUTPUT:
1863 RETVAL
1864
1865void
1866iw::DESTROY ()
1867
1868#############################################################################
1869# urxvt::pw
1870#############################################################################
1871
1872MODULE = urxvt PACKAGE = urxvt::pw
1873
1874SV *
1875pw::new ()
1876 CODE:
1877 pw *w = new pw;
1878 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
1879 w->self = (HV *)SvRV (RETVAL);
1880 OUTPUT:
1881 RETVAL
1882
1883CHAINED
1884pw::start (int pid)
1885 CODE:
1886 THIS->start (pid);
1887 OUTPUT:
1888 RETVAL
1889
1890CHAINED
1891iow::stop ()
1892 CODE:
1893 THIS->stop ();
1894 OUTPUT:
1895 RETVAL
1896
1897void
1898pw::DESTROY ()
1899
1900

Diff Legend

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