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.68 by root, Mon Jan 16 08:48:09 2006 UTC vs.
Revision 1.96 by root, Fri Feb 3 05:47:05 2006 UTC

39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45# define GRAB_CURSOR THIS->leftptr_cursor
46#else 46#else
47# define GRAB_CURSOR None 47# define GRAB_CURSOR None
48#endif 48#endif
49 49
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
59static SV *
60taint (SV *sv)
61{
62 SvTAINT (sv);
63 return sv;
64}
65
66static SV *
67taint_if (SV *sv, SV *src)
68{
69 if (SvTAINTED (src))
70 SvTAINT (sv);
71
72 return sv;
73}
74 58
75static wchar_t * 59static wchar_t *
76sv2wcs (SV *sv) 60sv2wcs (SV *sv)
77{ 61{
78 STRLEN len; 62 STRLEN len;
96new_ref (HV *hv, const char *klass) 80new_ref (HV *hv, const char *klass)
97{ 81{
98 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
99} 83}
100 84
101//TODO: use magic
102static SV * 85static SV *
103newSVptr (void *ptr, const char *klass) 86newSVptr (void *ptr, const char *klass)
104{ 87{
105 HV *hv = newHV (); 88 HV *hv = newHV ();
106 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
129 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);
130 113
131 return (long)mg->mg_ptr; 114 return (long)mg->mg_ptr;
132} 115}
133 116
134#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 117#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
135#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 118#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
136 119
137///////////////////////////////////////////////////////////////////////////// 120/////////////////////////////////////////////////////////////////////////////
121
122#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
138 123
139struct perl_watcher 124struct perl_watcher
140{ 125{
141 SV *cbsv; 126 SV *cbsv;
142 HV *self; 127 HV *self;
143 128
144 perl_watcher () 129 perl_watcher ()
145 : cbsv (newSV (0)) 130 : cbsv (0)
146 { 131 {
147 } 132 }
148 133
149 ~perl_watcher () 134 ~perl_watcher ()
150 { 135 {
151 SvREFCNT_dec (cbsv); 136 SvREFCNT_dec (cbsv);
152 } 137 }
153 138
154 void cb (SV *cb) 139 void cb (SV *cb)
155 { 140 {
156 sv_setsv (cbsv, cb); 141 SvREFCNT_dec (cbsv);
142 cbsv = newSVsv (cb);
157 } 143 }
158 144
159 void invoke (const char *type, SV *self, int arg = -1); 145 void invoke (const char *type, SV *self, int arg = -1);
160}; 146};
161 147
184 170
185 if (SvTRUE (ERRSV)) 171 if (SvTRUE (ERRSV))
186 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 172 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
187} 173}
188 174
189#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 175#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
190#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 176#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR ((sv), "urxvt::timer")
191 177
192struct timer : time_watcher, perl_watcher 178struct timer : perl_watcher, time_watcher
193{ 179{
194 tstamp interval; 180 tstamp interval;
195 181
196 timer () 182 timer ()
197 : time_watcher (this, &timer::execute) 183 : time_watcher (this, &timer::execute)
205 191
206 invoke ("urxvt::timer", newSVtimer (this)); 192 invoke ("urxvt::timer", newSVtimer (this));
207 } 193 }
208}; 194};
209 195
210#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 196#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
211#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 197#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR ((sv), "urxvt::iow")
212 198
213struct iow : io_watcher, perl_watcher 199struct iow : perl_watcher, io_watcher
214{ 200{
215 iow () 201 iow ()
216 : io_watcher (this, &iow::execute) 202 : io_watcher (this, &iow::execute)
217 { 203 {
218 } 204 }
221 { 207 {
222 invoke ("urxvt::iow", newSViow (this), revents); 208 invoke ("urxvt::iow", newSViow (this), revents);
223 } 209 }
224}; 210};
225 211
212#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
213#define SvIW(sv) (iw *)(perl_watcher *)SvPTR ((sv), "urxvt::iw")
214
215struct iw : perl_watcher, idle_watcher
216{
217 iw ()
218 : idle_watcher (this, &iw::execute)
219 {
220 }
221
222 void execute (idle_watcher &w)
223 {
224 invoke ("urxvt::iw", newSViw (this));
225 }
226};
227
228#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
229#define SvPW(sv) (pw *)(perl_watcher *)SvPTR ((sv), "urxvt::pw")
230
231struct pw : perl_watcher, child_watcher
232{
233 pw ()
234 : child_watcher (this, &pw::execute)
235 {
236 }
237
238 void execute (child_watcher &w, int status)
239 {
240 invoke ("urxvt::pw", newSVpw (this), status);
241 }
242};
243
226///////////////////////////////////////////////////////////////////////////// 244/////////////////////////////////////////////////////////////////////////////
227 245
228#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 246#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
229 247
230struct overlay { 248class overlay {
231 HV *self;
232 rxvt_term *THIS; 249 rxvt_term *THIS;
250 AV *overlay_av;
233 int x, y, w, h; 251 int x, y, w, h;
234 int border; 252 int border;
235 text_t **text; 253 text_t **text;
236 rend_t **rend; 254 rend_t **rend;
237 255
256public:
257 HV *self;
258
238 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);
239 ~overlay (); 260 ~overlay ();
240 261
241 void show (); 262 void show ();
242 void hide (); 263 void hide ();
245 266
246 void set (int x, int y, SV *str, SV *rend); 267 void set (int x, int y, SV *str, SV *rend);
247}; 268};
248 269
249overlay::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)
250: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2) 271: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
251{ 272{
252 if (border == 2) 273 if (border == 2)
253 { 274 {
254 w += 2; 275 w += 2;
255 h += 2; 276 h += 2;
294 *rp++ = r; 315 *rp++ = r;
295 } 316 }
296 } 317 }
297 318
298 show (); 319 show ();
299 THIS->want_refresh = 1;
300} 320}
301 321
302overlay::~overlay () 322overlay::~overlay ()
303{ 323{
304 hide (); 324 hide ();
309 delete [] rend[y]; 329 delete [] rend[y];
310 } 330 }
311 331
312 delete [] text; 332 delete [] text;
313 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));
314 346
315 THIS->want_refresh = 1; 347 THIS->want_refresh = 1;
316} 348}
317 349
318void 350void
319overlay::show ()
320{
321 char key[33]; sprintf (key, "%32lx", (long)this);
322
323 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
324 hv_store (hv, key, 32, newSViv ((long)this), 0);
325}
326
327void
328overlay::hide () 351overlay::hide ()
329{ 352{
330 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 353 if (!overlay_av)
354 return;
331 355
332 if (ovs) 356 int i;
357
358 for (i = AvFILL (overlay_av); i >= 0; i--)
359 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
333 { 360 {
334 char key[33]; sprintf (key, "%32lx", (long)this); 361 av_delete (overlay_av, i, G_DISCARD);
335 362 break;
336 HV *hv = (HV *)SvRV (*ovs);
337 hv_delete (hv, key, 32, G_DISCARD);
338 } 363 }
364
365 for (; i < AvFILL (overlay_av); i++)
366 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
367
368 av_pop (overlay_av);
369
370 SvREFCNT_dec (overlay_av);
371 overlay_av = 0;
372
373 THIS->want_refresh = 1;
339} 374}
340 375
341void overlay::swap () 376void overlay::swap ()
342{ 377{
343 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 378 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
383 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 418 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
384 croak ("rend must be arrayref"); 419 croak ("rend must be arrayref");
385 420
386 AV *av = (AV *)SvRV (rend); 421 AV *av = (AV *)SvRV (rend);
387 422
388 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 423 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
389 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 424 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
390 } 425 }
391 426
392 THIS->want_refresh = 1; 427 THIS->want_refresh = 1;
393} 428}
418 perl_environ = rxvt_environ; 453 perl_environ = rxvt_environ;
419 swap (perl_environ, environ); 454 swap (perl_environ, environ);
420 455
421 char *argv[] = { 456 char *argv[] = {
422 "", 457 "",
423 "-T", 458 "-e"
424 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 459 "BEGIN {"
460 " urxvt->bootstrap;"
461 " unshift @INC, '" LIBDIR "';"
462 "}"
463 ""
464 "use urxvt;"
425 }; 465 };
426 466
427 perl = perl_alloc (); 467 perl = perl_alloc ();
428 perl_construct (perl); 468 perl_construct (perl);
429 469
430 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL) 470 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
431 || perl_run (perl)) 471 || perl_run (perl))
432 { 472 {
433 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 473 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
434 474
435 perl_destruct (perl); 475 perl_destruct (perl);
440 swap (perl_environ, environ); 480 swap (perl_environ, environ);
441 481
442 rxvt_pop_locale (); 482 rxvt_pop_locale ();
443 } 483 }
444 484
485 if (perl)
486 {
445 // runs outside of perls ENV 487 // runs outside of perls ENV
446 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 488 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
447 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 489 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
490 }
448} 491}
449 492
450static void 493static void
451ungrab (rxvt_term *THIS) 494ungrab (rxvt_term *THIS)
452{ 495{
453 if (THIS->perl.grabtime) 496 if (THIS->perl.grabtime)
454 { 497 {
455 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 498 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
456 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 499 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
457 THIS->perl.grabtime = 0; 500 THIS->perl.grabtime = 0;
458 } 501 }
459} 502}
460 503
461static void
462swap_overlays (rxvt_term *term)
463{
464 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
465
466 if (HvKEYS (hv))
467 {
468 hv_iterinit (hv);
469
470 while (HE *he = hv_iternext (hv))
471 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
472 }
473}
474
475bool 504bool
476rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 505rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
477{ 506{
478 if (!perl || !term->perl.self) 507 if (!perl || !term->perl.self)
479 return false; 508 return false;
480 509
481 // pre-handling of some events 510 // pre-handling of some events
482 if (htype == HOOK_REFRESH_END) 511 if (htype == HOOK_REFRESH_END)
483 swap_overlays (term); 512 {
513 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
514
515 for (int i = 0; i <= AvFILL (av); i++)
516 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
517 }
484 518
485 swap (perl_environ, environ); 519 swap (perl_environ, environ);
486 520
487 bool event_consumed; 521 bool event_consumed;
488 522
515 case DT_LONG: 549 case DT_LONG:
516 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 550 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
517 break; 551 break;
518 552
519 case DT_STR: 553 case DT_STR:
520 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 554 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
521 break; 555 break;
522 556
523 case DT_STR_LEN: 557 case DT_STR_LEN:
524 { 558 {
525 char *str = va_arg (ap, char *); 559 char *str = va_arg (ap, char *);
526 int len = va_arg (ap, int); 560 int len = va_arg (ap, int);
527 561
528 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
529 } 563 }
530 break; 564 break;
531 565
532 case DT_WCS_LEN: 566 case DT_WCS_LEN:
533 { 567 {
534 wchar_t *wstr = va_arg (ap, wchar_t *); 568 wchar_t *wstr = va_arg (ap, wchar_t *);
569 int wlen = va_arg (ap, int);
570
571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 }
573 break;
574
575 case DT_LCS_LEN:
576 {
577 long *lstr = va_arg (ap, long *);
535 int wlen = va_arg (ap, int); 578 int llen = va_arg (ap, int);
536 579
537 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
538 } 581 }
539 break; 582 break;
540 583
541 case DT_XEVENT: 584 case DT_XEVENT:
542 { 585 {
543 XEvent *xe = va_arg (ap, XEvent *); 586 XEvent *xe = va_arg (ap, XEvent *);
544 HV *hv = newHV (); 587 HV *hv = newHV ();
545 588
546# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 589# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
547# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 590# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
591# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
548# undef set 592# undef set
549 593
550 setiv (type, xe->type); 594 setiv (type, xe->type);
551 setiv (send_event, xe->xany.send_event); 595 setiv (send_event, xe->xany.send_event);
552 setiv (serial, xe->xany.serial); 596 setiv (serial, xe->xany.serial);
553 597
556 case KeyPress: 600 case KeyPress:
557 case KeyRelease: 601 case KeyRelease:
558 case ButtonPress: 602 case ButtonPress:
559 case ButtonRelease: 603 case ButtonRelease:
560 case MotionNotify: 604 case MotionNotify:
605 setuv (window, xe->xmotion.window);
606 setuv (root, xe->xmotion.root);
607 setuv (subwindow, xe->xmotion.subwindow);
561 setiv (time, xe->xmotion.time); 608 setuv (time, xe->xmotion.time);
562 setiv (x, xe->xmotion.x); 609 setiv (x, xe->xmotion.x);
563 setiv (y, xe->xmotion.y); 610 setiv (y, xe->xmotion.y);
564 setiv (row, xe->xmotion.y / term->fheight); 611 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
565 setiv (col, xe->xmotion.x / term->fwidth); 612 setiv (col, xe->xmotion.x / term->fwidth);
566 setiv (x_root, xe->xmotion.x_root); 613 setiv (x_root, xe->xmotion.x_root);
567 setiv (y_root, xe->xmotion.y_root); 614 setiv (y_root, xe->xmotion.y_root);
568 setiv (state, xe->xmotion.state); 615 setuv (state, xe->xmotion.state);
616
617 switch (xe->type)
618 {
619 case KeyPress:
620 case KeyRelease:
621 setuv (keycode, xe->xkey.keycode);
622 break;
623
624 case ButtonPress:
625 case ButtonRelease:
626 setuv (button, xe->xbutton.button);
627 break;
628
629 case MotionNotify:
630 setiv (is_hint, xe->xmotion.is_hint);
631 break;
632 }
633
569 break; 634 break;
570 }
571 635
636 case MapNotify:
637 case UnmapNotify:
638 case ConfigureNotify:
639 setuv (event, xe->xconfigure.event);
640 setuv (window, xe->xconfigure.window);
641
572 switch (xe->type) 642 switch (xe->type)
573 { 643 {
574 case KeyPress: 644 case ConfigureNotify:
575 case KeyRelease: 645 setiv (x, xe->xconfigure.x);
576 setiv (keycode, xe->xkey.keycode); 646 setiv (y, xe->xconfigure.y);
647 setiv (width, xe->xconfigure.width);
648 setiv (height, xe->xconfigure.height);
649 setuv (above, xe->xconfigure.above);
650 break;
651 }
652
577 break; 653 break;
578 654
579 case ButtonPress: 655 case PropertyNotify:
580 case ButtonRelease: 656 setuv (window, xe->xproperty.window);
581 setiv (button, xe->xbutton.button); 657 setuv (atom, xe->xproperty.atom);
658 setuv (time, xe->xproperty.time);
659 setiv (state, xe->xproperty.state);
582 break; 660 break;
583 661
584 case MotionNotify: 662 case ClientMessage:
585 setiv (is_hint, xe->xmotion.is_hint); 663 setuv (window, xe->xclient.window);
664 setuv (message_type, xe->xclient.message_type);
665 setuv (format, xe->xclient.format);
666 setuv (l0, xe->xclient.data.l[0]);
667 setuv (l1, xe->xclient.data.l[1]);
668 setuv (l2, xe->xclient.data.l[2]);
669 setuv (l3, xe->xclient.data.l[3]);
670 setuv (l4, xe->xclient.data.l[4]);
586 break; 671 break;
587 } 672 }
588 673
589 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 674 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
590 } 675 }
631 else 716 else
632 event_consumed = false; 717 event_consumed = false;
633 718
634 // post-handling of some events 719 // post-handling of some events
635 if (htype == HOOK_REFRESH_BEGIN) 720 if (htype == HOOK_REFRESH_BEGIN)
636 swap_overlays (term); 721 {
722 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
723
724 for (int i = AvFILL (av); i >= 0; i--)
725 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
726 }
637 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
638 { 728 {
639 clearSVptr ((SV *)term->perl.self); 729 clearSVptr ((SV *)term->perl.self);
640 SvREFCNT_dec ((SV *)term->perl.self); 730 SvREFCNT_dec ((SV *)term->perl.self);
731
732 // don't allow further calls
733 term->perl.self = 0;
641 } 734 }
642 735
643 swap (perl_environ, environ); 736 swap (perl_environ, environ);
644 737
645 return event_consumed; 738 return event_consumed;
762 const_iv (SelectionRequest), 855 const_iv (SelectionRequest),
763 const_iv (SelectionNotify), 856 const_iv (SelectionNotify),
764 const_iv (ColormapNotify), 857 const_iv (ColormapNotify),
765 const_iv (ClientMessage), 858 const_iv (ClientMessage),
766 const_iv (MappingNotify), 859 const_iv (MappingNotify),
860# if ENABLE_XIM_ONTHESPOT
861 const_iv (XIMReverse),
862 const_iv (XIMUnderline),
863 const_iv (XIMHighlight),
864 const_iv (XIMPrimary),
865 const_iv (XIMSecondary),
866 const_iv (XIMTertiary),
867 const_iv (XIMVisibleToForward),
868 const_iv (XIMVisibleToBackword),
869 const_iv (XIMVisibleToCenter),
870# if 0
871 const_iv (XIMForwardChar),
872 const_iv (XIMBackwardChar),
873 const_iv (XIMForwardWord),
874 const_iv (XIMBackwardWord),
875 const_iv (XIMCaretUp),
876 const_iv (XIMCaretDown),
877 const_iv (XIMNextLine),
878 const_iv (XIMPreviousLine),
879 const_iv (XIMLineStart),
880 const_iv (XIMLineEnd),
881 const_iv (XIMAbsolutePosition),
882 const_iv (XIMDontChange),
883# endif
884# endif
767 }; 885 };
768 886
769 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 887 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
770 civ-- > const_iv; )
771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 888 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
772} 889}
773 890
774void 891void
775warn (const char *msg) 892warn (const char *msg)
779void 896void
780fatal (const char *msg) 897fatal (const char *msg)
781 CODE: 898 CODE:
782 rxvt_fatal ("%s", msg); 899 rxvt_fatal ("%s", msg);
783 900
784SV *
785untaint (SV *sv)
786 CODE:
787 RETVAL = newSVsv (sv);
788 SvTAINTED_off (RETVAL);
789 OUTPUT:
790 RETVAL
791
792void 901void
793_exit (int status) 902_exit (int status)
794
795bool
796safe ()
797 CODE:
798 RETVAL = !rxvt_tainted ();
799 OUTPUT:
800 RETVAL
801 903
802NV 904NV
803NOW () 905NOW ()
804 CODE: 906 CODE:
805 RETVAL = NOW; 907 RETVAL = NOW;
852 | ((new_value << RS_customShift) & RS_customMask); 954 | ((new_value << RS_customShift) & RS_customMask);
853} 955}
854 OUTPUT: 956 OUTPUT:
855 RETVAL 957 RETVAL
856 958
959void
960termlist ()
961 PPCODE:
962{
963 EXTEND (SP, rxvt_term::termlist.size ());
964
965 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
966 if ((*t)->perl.self)
967 PUSHs (sv_2mortal (newSVterm (*t)));
968}
969
857MODULE = urxvt PACKAGE = urxvt::term 970MODULE = urxvt PACKAGE = urxvt::term
858 971
859SV * 972SV *
860_new (...) 973_new (AV *env, AV *arg)
861 CODE: 974 CODE:
862{ 975{
863 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
864 croak ("first argument to urxvt::term->_new must be arrayref");
865
866 rxvt_term *term = new rxvt_term; 976 rxvt_term *term = new rxvt_term;
867 977
868 term->argv = new stringvec; 978 stringvec *argv = new stringvec;
869 term->envv = new stringvec; 979 stringvec *envv = new stringvec;
870 980
871 for (int i = 1; i < items; i++) 981 for (int i = 0; i <= AvFILL (arg); i++)
872 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 982 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
873 983
874 AV *envv = (AV *)SvRV (ST (0));
875 for (int i = av_len (envv) + 1; i--; ) 984 for (int i = AvFILL (env) + 1; i--; )
876 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 985 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
877 986
878 term->envv->push_back (0); 987 envv->push_back (0);
879 988
880 bool success; 989 bool success;
881 990
882 try 991 try
883 { 992 {
884 success = term->init (term->argv->size (), term->argv->begin ()); 993 success = term->init (argv, envv);
885 } 994 }
886 catch (const class rxvt_failure_exception &e) 995 catch (const class rxvt_failure_exception &e)
887 { 996 {
888 success = false; 997 success = false;
889 } 998 }
901 RETVAL 1010 RETVAL
902 1011
903void 1012void
904rxvt_term::destroy () 1013rxvt_term::destroy ()
905 1014
906#if ENABLE_PERL_FRILLS
907
908void
909rxvt_term::XListProperties (U32 window)
910 PPCODE:
911{
912 int count;
913 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
914
915 EXTEND (SP, count);
916 while (count--)
917 PUSHs (newSVuv ((U32)props [count]));
918
919 XFree (props);
920}
921
922void
923rxvt_term::XGetWindowProperty (U32 window, U32 property)
924 PPCODE:
925{
926 Atom type;
927 int format;
928 unsigned long nitems;
929 unsigned long bytes_after;
930 unsigned char *prop;
931 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
932 0, 1<<30, 0, AnyPropertyType,
933 &type, &format, &nitems, &bytes_after, &prop);
934 if (type != None)
935 {
936 EXTEND (SP, 3);
937 PUSHs (newSVuv ((U32)type));
938 PUSHs (newSViv (format));
939 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
940 XFree (prop);
941 }
942}
943
944void
945rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
946 CODE:
947{
948 STRLEN len;
949 char *data_ = SvPVbyte (data, len);
950
951 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
952 type, format, PropModeReplace,
953 (unsigned char *)data, len * 8 / format);
954}
955
956void
957rxvt_term::XDeleteProperty (U32 window, U32 property)
958 CODE:
959 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
960
961U32
962rxvt_term::DefaultRootWindow ()
963 CODE:
964 RETVAL = (U32)THIS->display->root;
965 OUTPUT:
966 RETVAL
967
968U32
969rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
970 CODE:
971 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
972 x, y, width, height, 0,
973 THIS->pix_colors_focused[Color_border],
974 THIS->pix_colors_focused[Color_border]);
975 OUTPUT:
976 RETVAL
977
978void
979rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
980 CODE:
981 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
982
983void
984rxvt_term::XMapWindow (U32 window)
985 CODE:
986 XMapWindow (THIS->display->display, (Window)window);
987
988void
989rxvt_term::XUnmapWindow (U32 window)
990 CODE:
991 XUnmapWindow (THIS->display->display, (Window)window);
992
993#endif
994
995void 1015void
996rxvt_term::set_should_invoke (int htype, int inc) 1016rxvt_term::set_should_invoke (int htype, int inc)
997 CODE: 1017 CODE:
998 THIS->perl.should_invoke [htype] += inc; 1018 THIS->perl.should_invoke [htype] += inc;
999 1019
1000void 1020void
1001rxvt_term::grab_button (int button, U32 modifiers) 1021rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1002 CODE: 1022 CODE:
1003 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1023 XGrabButton (THIS->dpy, button, modifiers, window, 1,
1004 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1024 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1005 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1025 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1006 1026
1027void
1028rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1029 CODE:
1030 XUngrabButton (THIS->dpy, button, modifiers, window);
1031
1032#if 0
1033
1034void
1035XGrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1036 C_ARGS:
1037 THIS->dpy, keycode, modifiers, window, 1,
1038 GrabModeSync, GrabModeSync
1039
1040void
1041XUngrabKey (rxvt_term *THIS, int keycode, U32 modifiers, Window window = THIS->vt)
1042 C_ARGS: THIS->dpy, keycode, modifiers, window
1043
1044#endif
1045
1007bool 1046bool
1008rxvt_term::grab (U32 eventtime, int sync = 0) 1047rxvt_term::grab (Time eventtime, int sync = 0)
1009 CODE: 1048 CODE:
1010{ 1049{
1011 int mode = sync ? GrabModeSync : GrabModeAsync; 1050 int mode = sync ? GrabModeSync : GrabModeAsync;
1012 1051
1013 THIS->perl.grabtime = 0; 1052 THIS->perl.grabtime = 0;
1014 1053
1015 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1054 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1016 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1055 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1017 mode, mode, None, GRAB_CURSOR, eventtime)) 1056 mode, mode, None, GRAB_CURSOR, eventtime))
1018 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1057 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1019 THIS->perl.grabtime = eventtime; 1058 THIS->perl.grabtime = eventtime;
1020 else 1059 else
1021 XUngrabPointer (THIS->display->display, eventtime); 1060 XUngrabPointer (THIS->dpy, eventtime);
1022 1061
1023 RETVAL = !!THIS->perl.grabtime; 1062 RETVAL = !!THIS->perl.grabtime;
1024} 1063}
1025 OUTPUT: 1064 OUTPUT:
1026 RETVAL 1065 RETVAL
1027 1066
1028void 1067void
1029rxvt_term::allow_events_async () 1068rxvt_term::allow_events_async ()
1030 CODE: 1069 CODE:
1031 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1070 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1032 1071
1033void 1072void
1034rxvt_term::allow_events_sync () 1073rxvt_term::allow_events_sync ()
1035 CODE: 1074 CODE:
1036 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1075 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1037 1076
1038void 1077void
1039rxvt_term::allow_events_replay () 1078rxvt_term::allow_events_replay ()
1040 CODE: 1079 CODE:
1041 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1080 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1042 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1081 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1043 1082
1044void 1083void
1045rxvt_term::ungrab () 1084rxvt_term::ungrab ()
1046 CODE: 1085 CODE:
1047 ungrab (THIS); 1086 ungrab (THIS);
1071 char *mbstr = rxvt_wcstombs (wstr); 1110 char *mbstr = rxvt_wcstombs (wstr);
1072 rxvt_pop_locale (); 1111 rxvt_pop_locale ();
1073 1112
1074 free (wstr); 1113 free (wstr);
1075 1114
1076 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1115 RETVAL = newSVpv (mbstr, 0);
1077 free (mbstr); 1116 free (mbstr);
1078} 1117}
1079 OUTPUT: 1118 OUTPUT:
1080 RETVAL 1119 RETVAL
1081 1120
1088 1127
1089 rxvt_push_locale (THIS->locale); 1128 rxvt_push_locale (THIS->locale);
1090 wchar_t *wstr = rxvt_mbstowcs (data, len); 1129 wchar_t *wstr = rxvt_mbstowcs (data, len);
1091 rxvt_pop_locale (); 1130 rxvt_pop_locale ();
1092 1131
1093 RETVAL = taint_if (wcs2sv (wstr), octets); 1132 RETVAL = wcs2sv (wstr);
1094 free (wstr); 1133 free (wstr);
1095} 1134}
1096 OUTPUT: 1135 OUTPUT:
1097 RETVAL 1136 RETVAL
1098 1137
1105#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1144#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1106#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1145#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1107#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1146#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1108#define TERM_OFFSET_focus TERM_OFFSET(focus) 1147#define TERM_OFFSET_focus TERM_OFFSET(focus)
1109#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1148#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1149#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1150#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1151#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1110#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1152#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1111#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1153#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1112#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1154#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1113 1155
1114int 1156int
1121 fbase = TERM_OFFSET_fbase 1163 fbase = TERM_OFFSET_fbase
1122 nrow = TERM_OFFSET_nrow 1164 nrow = TERM_OFFSET_nrow
1123 ncol = TERM_OFFSET_ncol 1165 ncol = TERM_OFFSET_ncol
1124 focus = TERM_OFFSET_focus 1166 focus = TERM_OFFSET_focus
1125 mapped = TERM_OFFSET_mapped 1167 mapped = TERM_OFFSET_mapped
1168 int_bwidth = TERM_OFFSET_int_bwidth
1169 ext_bwidth = TERM_OFFSET_ext_bwidth
1170 lineSpace = TERM_OFFSET_lineSpace
1126 saveLines = TERM_OFFSET_saveLines 1171 saveLines = TERM_OFFSET_saveLines
1127 total_rows = TERM_OFFSET_total_rows 1172 total_rows = TERM_OFFSET_total_rows
1128 top_row = TERM_OFFSET_top_row 1173 top_row = TERM_OFFSET_top_row
1129 CODE: 1174 CODE:
1130 RETVAL = *(int *)((char *)THIS + ix); 1175 RETVAL = *(int *)((char *)THIS + ix);
1135rxvt_term::ModLevel3Mask () 1180rxvt_term::ModLevel3Mask ()
1136 ALIAS: 1181 ALIAS:
1137 ModLevel3Mask = 0 1182 ModLevel3Mask = 0
1138 ModMetaMask = 1 1183 ModMetaMask = 1
1139 ModNumLockMask = 2 1184 ModNumLockMask = 2
1185 current_screen = 3
1186 hidden_cursor = 4
1140 CODE: 1187 CODE:
1141 switch (ix) 1188 switch (ix)
1142 { 1189 {
1143 case 0: RETVAL = THIS->ModLevel3Mask; break; 1190 case 0: RETVAL = THIS->ModLevel3Mask; break;
1144 case 1: RETVAL = THIS->ModMetaMask; break; 1191 case 1: RETVAL = THIS->ModMetaMask; break;
1145 case 2: RETVAL = THIS->ModNumLockMask; break; 1192 case 2: RETVAL = THIS->ModNumLockMask; break;
1193 case 3: RETVAL = THIS->current_screen; break;
1194 case 4: RETVAL = THIS->hidden_cursor; break;
1146 } 1195 }
1147 OUTPUT: 1196 OUTPUT:
1148 RETVAL 1197 RETVAL
1149 1198
1150char * 1199char *
1188 if (events != EVENT_UNDEF) 1237 if (events != EVENT_UNDEF)
1189 THIS->pty_ev.set (events); 1238 THIS->pty_ev.set (events);
1190 OUTPUT: 1239 OUTPUT:
1191 RETVAL 1240 RETVAL
1192 1241
1193U32 1242int
1243rxvt_term::pty_fd ()
1244 CODE:
1245 RETVAL = THIS->pty->pty;
1246 OUTPUT:
1247 RETVAL
1248
1249Window
1194rxvt_term::parent () 1250rxvt_term::parent ()
1195 CODE: 1251 CODE:
1196 RETVAL = (U32)THIS->parent [0]; 1252 RETVAL = THIS->parent [0];
1197 OUTPUT: 1253 OUTPUT:
1198 RETVAL 1254 RETVAL
1199 1255
1200U32 1256Window
1201rxvt_term::vt () 1257rxvt_term::vt ()
1202 CODE: 1258 CODE:
1203 RETVAL = (U32)THIS->vt; 1259 RETVAL = THIS->vt;
1204 OUTPUT: 1260 OUTPUT:
1205 RETVAL 1261 RETVAL
1206 1262
1207void 1263void
1208rxvt_term::vt_emask_add (U32 emask) 1264rxvt_term::vt_emask_add (U32 emask)
1230} 1286}
1231 OUTPUT: 1287 OUTPUT:
1232 RETVAL 1288 RETVAL
1233 1289
1234void 1290void
1291rxvt_term::focus_in ()
1292
1293void
1294rxvt_term::focus_out ()
1295
1296void
1235rxvt_term::want_refresh () 1297rxvt_term::want_refresh ()
1236 CODE: 1298 CODE:
1237 THIS->want_refresh = 1; 1299 THIS->want_refresh = 1;
1238 1300
1239void 1301void
1245 1307
1246 line_t &l = ROW(row_number); 1308 line_t &l = ROW(row_number);
1247 1309
1248 if (GIMME_V != G_VOID) 1310 if (GIMME_V != G_VOID)
1249 { 1311 {
1250 wchar_t *wstr = new wchar_t [THIS->ncol]; 1312 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1251 1313
1252 for (int col = 0; col < THIS->ncol; col++) 1314 for (int col = 0; col < THIS->ncol; col++)
1253 wstr [col] = l.t [col]; 1315 wstr [col] = l.t [col];
1254 1316
1255 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1317 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1256
1257 delete [] wstr;
1258 } 1318 }
1259 1319
1260 if (new_text) 1320 if (new_text)
1261 { 1321 {
1262 wchar_t *wstr = sv2wcs (new_text); 1322 wchar_t *wstr = sv2wcs (new_text);
1263 1323
1264 int len = min (wcslen (wstr) - start_ofs, max_len); 1324 int len = min (wcslen (wstr) - start_ofs, max_len);
1265 1325
1266 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1326 if (start_col < 0 || start_col + len > THIS->ncol)
1267 { 1327 {
1268 free (wstr); 1328 free (wstr);
1269 croak ("new_text extends beyond horizontal margins"); 1329 croak ("new_text extends beyond horizontal margins");
1270 } 1330 }
1271 1331
1303 { 1363 {
1304 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1364 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1305 croak ("new_rend must be arrayref"); 1365 croak ("new_rend must be arrayref");
1306 1366
1307 AV *av = (AV *)SvRV (new_rend); 1367 AV *av = (AV *)SvRV (new_rend);
1308 int len = min (av_len (av) + 1 - start_ofs, max_len); 1368 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1309 1369
1310 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1370 if (start_col < 0 || start_col + len > THIS->ncol)
1311 croak ("new_rend array extends beyond horizontal margins"); 1371 croak ("new_rend array extends beyond horizontal margins");
1312 1372
1313 for (int col = start_col; col < start_col + len; col++) 1373 for (int col = start_col; col < start_col + len; col++)
1314 { 1374 {
1315 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1375 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1355rxvt_term::special_encode (SV *string) 1415rxvt_term::special_encode (SV *string)
1356 CODE: 1416 CODE:
1357{ 1417{
1358 wchar_t *wstr = sv2wcs (string); 1418 wchar_t *wstr = sv2wcs (string);
1359 int wlen = wcslen (wstr); 1419 int wlen = wcslen (wstr);
1360 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1420 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1361 1421
1362 rxvt_push_locale (THIS->locale); 1422 rxvt_push_locale (THIS->locale);
1363 1423
1364 wchar_t *r = rstr; 1424 wchar_t *r = rstr;
1365 for (wchar_t *s = wstr; *s; s++) 1425 for (wchar_t *s = wstr; *s; s++)
1426 {
1427 int w = WCWIDTH (*s);
1428
1366 if (wcwidth (*s) == 0) 1429 if (w == 0)
1367 { 1430 {
1368 if (r == rstr) 1431 if (r == rstr)
1369 croak ("leading combining character unencodable"); 1432 croak ("leading combining character unencodable");
1370 1433
1371 unicode_t n = rxvt_compose (r[-1], *s); 1434 unicode_t n = rxvt_compose (r[-1], *s);
1372 if (n == NOCHAR) 1435 if (n == NOCHAR)
1373 n = rxvt_composite.compose (r[-1], *s); 1436 n = rxvt_composite.compose (r[-1], *s);
1374 1437
1375 r[-1] = n; 1438 r[-1] = n;
1376 } 1439 }
1377#if !UNICODE_3 1440#if !UNICODE_3
1378 else if (*s >= 0x10000) 1441 else if (*s >= 0x10000)
1379 *r++ = rxvt_composite.compose (*s); 1442 *r++ = rxvt_composite.compose (*s);
1380#endif 1443#endif
1381 else 1444 else
1382 *r++ = *s; 1445 *r++ = *s;
1446
1447 // the *2 above only allows wcwidth <= 2
1448 if (w > 1)
1449 *r++ = NOCHAR;
1450 }
1383 1451
1384 rxvt_pop_locale (); 1452 rxvt_pop_locale ();
1385 1453
1386 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1454 RETVAL = wcs2sv (rstr, r - rstr);
1387
1388 delete [] rstr;
1389} 1455}
1390 OUTPUT: 1456 OUTPUT:
1391 RETVAL 1457 RETVAL
1392 1458
1393SV * 1459SV *
1405 else if (IS_COMPOSE (*s)) 1471 else if (IS_COMPOSE (*s))
1406 dlen += rxvt_composite.expand (*s, 0); 1472 dlen += rxvt_composite.expand (*s, 0);
1407 else 1473 else
1408 dlen++; 1474 dlen++;
1409 1475
1410 wchar_t *rstr = new wchar_t [dlen]; 1476 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1411 1477
1412 // decode 1478 // decode
1413 wchar_t *r = rstr; 1479 wchar_t *r = rstr;
1414 for (wchar_t *s = wstr; *s; s++) 1480 for (wchar_t *s = wstr; *s; s++)
1415 if (*s == NOCHAR) 1481 if (*s == NOCHAR)
1417 else if (IS_COMPOSE (*s)) 1483 else if (IS_COMPOSE (*s))
1418 r += rxvt_composite.expand (*s, r); 1484 r += rxvt_composite.expand (*s, r);
1419 else 1485 else
1420 *r++ = *s; 1486 *r++ = *s;
1421 1487
1422 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1488 RETVAL = wcs2sv (rstr, r - rstr);
1423
1424 delete [] rstr;
1425} 1489}
1426 OUTPUT: 1490 OUTPUT:
1427 RETVAL 1491 RETVAL
1428 1492
1429void 1493void
1449 1513
1450 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1514 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1451 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1515 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1452 1516
1453 if (GIMME_V != G_VOID) 1517 if (GIMME_V != G_VOID)
1454 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef); 1518 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
1455 1519
1456 if (newval) 1520 if (newval)
1457 { 1521 {
1458 if (SvOK (newval)) 1522 if (SvOK (newval))
1459 { 1523 {
1466 } 1530 }
1467} 1531}
1468 1532
1469const char * 1533const char *
1470rxvt_term::x_resource (const char *name) 1534rxvt_term::x_resource (const char *name)
1471 CLEANUP:
1472 SvTAINTED_on (ST (0));
1473 1535
1474bool 1536bool
1475rxvt_term::option (U32 optval, int set = -1) 1537rxvt_term::option (U32 optval, int set = -1)
1476 CODE: 1538 CODE:
1477{ 1539{
1482 if (set) 1544 if (set)
1483 THIS->options |= optval; 1545 THIS->options |= optval;
1484 else 1546 else
1485 THIS->options &= ~optval; 1547 THIS->options &= ~optval;
1486 1548
1549 if (THIS->check_ev.is_active ()) // avoid doing this before START
1487 switch (optval) 1550 switch (optval)
1488 { 1551 {
1489 case Opt_skipBuiltinGlyphs: 1552 case Opt_skipBuiltinGlyphs:
1490 THIS->set_fonts (); 1553 THIS->set_fonts ();
1491 THIS->scr_remap_chars (); 1554 THIS->scr_remap_chars ();
1492 THIS->scr_touch (true); 1555 THIS->scr_touch (true);
1493 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1494 break; 1557 break;
1495 1558
1496 case Opt_cursorUnderline: 1559 case Opt_cursorUnderline:
1497 THIS->want_refresh = 1; 1560 THIS->want_refresh = 1;
1498 break; 1561 break;
1499 1562
1500# case Opt_scrollBar_floating: 1563# case Opt_scrollBar_floating:
1501# case Opt_scrollBar_right: 1564# case Opt_scrollBar_right:
1502# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1565# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1503# break; 1566# break;
1504 } 1567 }
1505 } 1568 }
1506} 1569}
1507 OUTPUT: 1570 OUTPUT:
1508 RETVAL 1571 RETVAL
1509 1572
1537 PUSHs (sv_2mortal (newSViv (rc.col))); 1600 PUSHs (sv_2mortal (newSViv (rc.col)));
1538 } 1601 }
1539 1602
1540 if (items == 3) 1603 if (items == 3)
1541 { 1604 {
1605 rc.row = SvIV (ST (1));
1606 rc.col = SvIV (ST (2));
1607
1608 if (ix == 2)
1609 {
1610 if (rc.col == 0)
1611 {
1612 // col == 0 means end of previous line
1613 rc.row--;
1614 rc.col = THIS->ncol;
1615 }
1616 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1617 && rc.col > ROW(rc.row).l)
1618 {
1619 // col >= length means while line and add newline
1620 rc.col = THIS->ncol;
1621 }
1622 }
1623
1624 clamp_it (rc.col, 0, THIS->ncol);
1542 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); 1625 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1543 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1544 1626
1545 if (ix) 1627 if (ix)
1546 THIS->want_refresh = 1; 1628 THIS->want_refresh = 1;
1547 } 1629 }
1548} 1630}
1552 CODE: 1634 CODE:
1553 RETVAL = THIS->charsets [THIS->screen.charset]; 1635 RETVAL = THIS->charsets [THIS->screen.charset];
1554 OUTPUT: 1636 OUTPUT:
1555 RETVAL 1637 RETVAL
1556 1638
1557#void 1639void
1558#rxvt_term::selection_clear () 1640rxvt_term::selection_clear ()
1559 1641
1560void 1642void
1561rxvt_term::selection_make (U32 eventtime, bool rect = false) 1643rxvt_term::selection_make (Time eventtime, bool rect = false)
1562 CODE: 1644 CODE:
1563 THIS->selection.op = SELECTION_CONT; 1645 THIS->selection.op = SELECTION_CONT;
1564 THIS->selection.rect = rect; 1646 THIS->selection.rect = rect;
1565 THIS->selection_make (eventtime); 1647 THIS->selection_make (eventtime);
1566 1648
1567int 1649int
1568rxvt_term::selection_grab (U32 eventtime) 1650rxvt_term::selection_grab (Time eventtime)
1569 1651
1570void 1652void
1571rxvt_term::selection (SV *newtext = 0) 1653rxvt_term::selection (SV *newtext = 0)
1572 PPCODE: 1654 PPCODE:
1573{ 1655{
1574 if (GIMME_V != G_VOID) 1656 if (GIMME_V != G_VOID)
1575 XPUSHs (THIS->selection.text 1657 XPUSHs (THIS->selection.text
1576 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1658 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1577 : &PL_sv_undef); 1659 : &PL_sv_undef);
1578 1660
1579 if (newtext) 1661 if (newtext)
1580 { 1662 {
1581 free (THIS->selection.text); 1663 free (THIS->selection.text);
1591void 1673void
1592rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1674rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1593 1675
1594void 1676void
1595rxvt_term::scr_bell () 1677rxvt_term::scr_bell ()
1678
1679void
1680rxvt_term::scr_change_screen (int screen)
1596 1681
1597void 1682void
1598rxvt_term::scr_add_lines (SV *string) 1683rxvt_term::scr_add_lines (SV *string)
1599 CODE: 1684 CODE:
1600{ 1685{
1641 o->self = (HV *)SvRV (RETVAL); 1726 o->self = (HV *)SvRV (RETVAL);
1642} 1727}
1643 OUTPUT: 1728 OUTPUT:
1644 RETVAL 1729 RETVAL
1645 1730
1731#############################################################################
1732# Various X Utility Functions
1733#############################################################################
1734
1735void
1736rxvt_term::XListProperties (Window window)
1737 PPCODE:
1738{
1739 int count;
1740 Atom *props = XListProperties (THIS->dpy, window, &count);
1741
1742 EXTEND (SP, count);
1743 while (count--)
1744 PUSHs (newSVuv ((U32)props [count]));
1745
1746 XFree (props);
1747}
1748
1749void
1750rxvt_term::XGetWindowProperty (Window window, Atom property)
1751 PPCODE:
1752{
1753 Atom type;
1754 int format;
1755 unsigned long nitems;
1756 unsigned long bytes_after;
1757 unsigned char *prop;
1758
1759 XGetWindowProperty (THIS->dpy, window, property,
1760 0, 1<<24, 0, AnyPropertyType,
1761 &type, &format, &nitems, &bytes_after, &prop);
1762
1763 if (type != None)
1764 {
1765 int elemsize = format == 16 ? sizeof (short)
1766 : format == 32 ? sizeof (long)
1767 : 1;
1768
1769 EXTEND (SP, 3);
1770 PUSHs (newSVuv ((U32)type));
1771 PUSHs (newSViv (format));
1772 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1773 XFree (prop);
1774 }
1775}
1776
1777void
1778rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1779 CODE:
1780{
1781 STRLEN len;
1782 char *data_ = SvPVbyte (data, len);
1783
1784 int elemsize = format == 16 ? sizeof (short)
1785 : format == 32 ? sizeof (long)
1786 : 1;
1787
1788 XChangeProperty (THIS->dpy, window, property,
1789 type, format, PropModeReplace,
1790 (unsigned char *)data_, len / elemsize);
1791 XSync (THIS->dpy, 0);
1792}
1793
1794Atom
1795XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1796 C_ARGS: term->dpy, atom_name, only_if_exists
1797
1798char *
1799XGetAtomName (rxvt_term *term, Atom atom)
1800 C_ARGS: term->dpy, atom
1801 CLEANUP:
1802 XFree (RETVAL);
1803
1804void
1805XDeleteProperty (rxvt_term *term, Window window, Atom property)
1806 C_ARGS: term->dpy, window, property
1807
1808Window
1809rxvt_term::DefaultRootWindow ()
1810 CODE:
1811 RETVAL = THIS->display->root;
1812 OUTPUT:
1813 RETVAL
1814
1815#if 0
1816
1817Window
1818XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1819 C_ARGS: term->dpy, (Window)parent,
1820 x, y, width, height, 0,
1821 term->pix_colors_focused[Color_border],
1822 term->pix_colors_focused[Color_border]
1823
1824#endif
1825
1826void
1827XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1828 C_ARGS: term->dpy, window, parent, x, y
1829
1830void
1831XMapWindow (rxvt_term *term, Window window)
1832 C_ARGS: term->dpy, window
1833
1834void
1835XUnmapWindow (rxvt_term *term, Window window)
1836 C_ARGS: term->dpy, window
1837
1838void
1839XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1840 C_ARGS: term->dpy, window, x, y, width, height
1841
1842void
1843rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1844 CODE:
1845{
1846 XWindowAttributes attr;
1847 XGetWindowAttributes (THIS->dpy, window, &attr);
1848 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1849}
1850
1851void
1852rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1853 PPCODE:
1854{
1855 int dx, dy;
1856 Window child;
1857
1858 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1859 {
1860 EXTEND (SP, 3);
1861 PUSHs (newSViv (dx));
1862 PUSHs (newSViv (dy));
1863 PUSHs (newSVuv (child));
1864 }
1865}
1866
1867#############################################################################
1868# urxvt::overlay
1869#############################################################################
1870
1646MODULE = urxvt PACKAGE = urxvt::overlay 1871MODULE = urxvt PACKAGE = urxvt::overlay
1647 1872
1648void 1873void
1649overlay::set (int x, int y, SV *text, SV *rend = 0) 1874overlay::set (int x, int y, SV *text, SV *rend = 0)
1650 1875
1654void 1879void
1655overlay::hide () 1880overlay::hide ()
1656 1881
1657void 1882void
1658overlay::DESTROY () 1883overlay::DESTROY ()
1884
1885#############################################################################
1886# urxvt::watcher
1887#############################################################################
1888
1889MODULE = urxvt PACKAGE = urxvt::watcher
1890
1891CHAINED
1892perl_watcher::cb (SV *cb)
1893 CODE:
1894 THIS->cb (cb);
1895 OUTPUT:
1896 RETVAL
1897
1898#############################################################################
1899# urxvt::timer
1900#############################################################################
1659 1901
1660MODULE = urxvt PACKAGE = urxvt::timer 1902MODULE = urxvt PACKAGE = urxvt::timer
1661 1903
1662SV * 1904SV *
1663timer::new () 1905timer::new ()
1664 CODE: 1906 CODE:
1665 timer *w = new timer; 1907 timer *w = new timer;
1666 w->start (NOW); 1908 w->start (NOW);
1667 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1909 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1668 w->self = (HV *)SvRV (RETVAL); 1910 w->self = (HV *)SvRV (RETVAL);
1669 OUTPUT:
1670 RETVAL
1671
1672timer *
1673timer::cb (SV *cb)
1674 CODE:
1675 THIS->cb (cb);
1676 RETVAL = THIS;
1677 OUTPUT: 1911 OUTPUT:
1678 RETVAL 1912 RETVAL
1679 1913
1680NV 1914NV
1681timer::at () 1915timer::at ()
1682 CODE: 1916 CODE:
1683 RETVAL = THIS->at; 1917 RETVAL = THIS->at;
1684 OUTPUT: 1918 OUTPUT:
1685 RETVAL 1919 RETVAL
1686 1920
1687timer * 1921CHAINED
1688timer::interval (NV interval) 1922timer::interval (NV interval)
1689 CODE: 1923 CODE:
1690 THIS->interval = interval; 1924 THIS->interval = interval;
1925 OUTPUT:
1691 RETVAL = THIS; 1926 RETVAL
1692 OUTPUT:
1693 RETVAL
1694 1927
1695timer * 1928CHAINED
1696timer::set (NV tstamp) 1929timer::set (NV tstamp)
1697 CODE: 1930 CODE:
1698 THIS->set (tstamp); 1931 THIS->set (tstamp);
1932 OUTPUT:
1699 RETVAL = THIS; 1933 RETVAL
1700 OUTPUT:
1701 RETVAL
1702 1934
1703timer * 1935CHAINED
1704timer::start (NV tstamp = THIS->at) 1936timer::start (NV tstamp = THIS->at)
1705 CODE: 1937 CODE:
1706 THIS->start (tstamp); 1938 THIS->start (tstamp);
1939 OUTPUT:
1707 RETVAL = THIS; 1940 RETVAL
1708 OUTPUT:
1709 RETVAL
1710 1941
1711timer * 1942CHAINED
1943timer::after (NV delay)
1944 CODE:
1945 THIS->start (NOW + delay);
1946 OUTPUT:
1947 RETVAL
1948
1949CHAINED
1712timer::stop () 1950timer::stop ()
1713 CODE: 1951 CODE:
1714 THIS->stop (); 1952 THIS->stop ();
1715 RETVAL = THIS;
1716 OUTPUT: 1953 OUTPUT:
1717 RETVAL 1954 RETVAL
1718 1955
1719void 1956void
1720timer::DESTROY () 1957timer::DESTROY ()
1958
1959#############################################################################
1960# urxvt::iow
1961#############################################################################
1721 1962
1722MODULE = urxvt PACKAGE = urxvt::iow 1963MODULE = urxvt PACKAGE = urxvt::iow
1723 1964
1724SV * 1965SV *
1725iow::new () 1966iow::new ()
1726 CODE: 1967 CODE:
1727 iow *w = new iow; 1968 iow *w = new iow;
1728 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 1969 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1729 w->self = (HV *)SvRV (RETVAL); 1970 w->self = (HV *)SvRV (RETVAL);
1730 OUTPUT: 1971 OUTPUT:
1731 RETVAL 1972 RETVAL
1732 1973
1733iow * 1974CHAINED
1734iow::cb (SV *cb)
1735 CODE:
1736 THIS->cb (cb);
1737 RETVAL = THIS;
1738 OUTPUT:
1739 RETVAL
1740
1741iow *
1742iow::fd (int fd) 1975iow::fd (int fd)
1743 CODE: 1976 CODE:
1744 THIS->fd = fd; 1977 THIS->fd = fd;
1978 OUTPUT:
1745 RETVAL = THIS; 1979 RETVAL
1746 OUTPUT:
1747 RETVAL
1748 1980
1749iow * 1981CHAINED
1750iow::events (short events) 1982iow::events (short events)
1751 CODE: 1983 CODE:
1752 THIS->events = events; 1984 THIS->events = events;
1985 OUTPUT:
1753 RETVAL = THIS; 1986 RETVAL
1754 OUTPUT:
1755 RETVAL
1756 1987
1757iow * 1988CHAINED
1758iow::start () 1989iow::start ()
1759 CODE: 1990 CODE:
1760 THIS->start (); 1991 THIS->start ();
1992 OUTPUT:
1761 RETVAL = THIS; 1993 RETVAL
1762 OUTPUT:
1763 RETVAL
1764 1994
1765iow * 1995CHAINED
1766iow::stop () 1996iow::stop ()
1767 CODE: 1997 CODE:
1768 THIS->stop (); 1998 THIS->stop ();
1769 RETVAL = THIS;
1770 OUTPUT: 1999 OUTPUT:
1771 RETVAL 2000 RETVAL
1772 2001
1773void 2002void
1774iow::DESTROY () 2003iow::DESTROY ()
1775 2004
2005#############################################################################
2006# urxvt::iw
2007#############################################################################
1776 2008
2009MODULE = urxvt PACKAGE = urxvt::iw
2010
2011SV *
2012iw::new ()
2013 CODE:
2014 iw *w = new iw;
2015 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2016 w->self = (HV *)SvRV (RETVAL);
2017 OUTPUT:
2018 RETVAL
2019
2020CHAINED
2021iw::start ()
2022 CODE:
2023 THIS->start ();
2024 OUTPUT:
2025 RETVAL
2026
2027CHAINED
2028iw::stop ()
2029 CODE:
2030 THIS->stop ();
2031 OUTPUT:
2032 RETVAL
2033
2034void
2035iw::DESTROY ()
2036
2037#############################################################################
2038# urxvt::pw
2039#############################################################################
2040
2041MODULE = urxvt PACKAGE = urxvt::pw
2042
2043SV *
2044pw::new ()
2045 CODE:
2046 pw *w = new pw;
2047 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2048 w->self = (HV *)SvRV (RETVAL);
2049 OUTPUT:
2050 RETVAL
2051
2052CHAINED
2053pw::start (int pid)
2054 CODE:
2055 THIS->start (pid);
2056 OUTPUT:
2057 RETVAL
2058
2059CHAINED
2060pw::stop ()
2061 CODE:
2062 THIS->stop ();
2063 OUTPUT:
2064 RETVAL
2065
2066void
2067pw::DESTROY ()
2068
2069

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines