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.73 by root, Wed Jan 18 09:40:53 2006 UTC vs.
Revision 1.103 by root, Mon Aug 7 21:38:24 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)
80new_ref (HV *hv, const char *klass) 80new_ref (HV *hv, const char *klass)
81{ 81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83} 83}
84 84
85//TODO: use magic
86static SV * 85static SV *
87newSVptr (void *ptr, const char *klass) 86newSVptr (void *ptr, const char *klass)
88{ 87{
89 HV *hv = newHV (); 88 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
113 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 112 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 113
115 return (long)mg->mg_ptr; 114 return (long)mg->mg_ptr;
116} 115}
117 116
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 117#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 118#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 119
121///////////////////////////////////////////////////////////////////////////// 120/////////////////////////////////////////////////////////////////////////////
121
122#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
122 123
123struct perl_watcher 124struct perl_watcher
124{ 125{
125 SV *cbsv; 126 SV *cbsv;
126 HV *self; 127 HV *self;
127 128
128 perl_watcher () 129 perl_watcher ()
129 : cbsv (newSV (0)) 130 : cbsv (0)
130 { 131 {
131 } 132 }
132 133
133 ~perl_watcher () 134 ~perl_watcher ()
134 { 135 {
135 SvREFCNT_dec (cbsv); 136 SvREFCNT_dec (cbsv);
136 } 137 }
137 138
138 void cb (SV *cb) 139 void cb (SV *cb)
139 { 140 {
140 sv_setsv (cbsv, cb); 141 SvREFCNT_dec (cbsv);
142 cbsv = newSVsv (cb);
141 } 143 }
142 144
143 void invoke (const char *type, SV *self, int arg = -1); 145 void invoke (const char *type, SV *self, int arg = -1);
144}; 146};
145 147
168 170
169 if (SvTRUE (ERRSV)) 171 if (SvTRUE (ERRSV))
170 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV)); 172 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
171} 173}
172 174
173#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer") 175#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
174#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer") 176#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR ((sv), "urxvt::timer")
175 177
176struct timer : time_watcher, perl_watcher 178struct timer : perl_watcher, time_watcher
177{ 179{
178 tstamp interval; 180 tstamp interval;
179 181
180 timer () 182 timer ()
181 : time_watcher (this, &timer::execute) 183 : time_watcher (this, &timer::execute)
189 191
190 invoke ("urxvt::timer", newSVtimer (this)); 192 invoke ("urxvt::timer", newSVtimer (this));
191 } 193 }
192}; 194};
193 195
194#define newSViow(iow) new_ref (iow->self, "urxvt::iow") 196#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
195#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow") 197#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR ((sv), "urxvt::iow")
196 198
197struct iow : io_watcher, perl_watcher 199struct iow : perl_watcher, io_watcher
198{ 200{
199 iow () 201 iow ()
200 : io_watcher (this, &iow::execute) 202 : io_watcher (this, &iow::execute)
201 { 203 {
202 } 204 }
205 { 207 {
206 invoke ("urxvt::iow", newSViow (this), revents); 208 invoke ("urxvt::iow", newSViow (this), revents);
207 } 209 }
208}; 210};
209 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
210///////////////////////////////////////////////////////////////////////////// 244/////////////////////////////////////////////////////////////////////////////
211 245
212#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 246#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
213 247
214struct overlay { 248class overlay {
215 HV *self;
216 rxvt_term *THIS; 249 rxvt_term *THIS;
250 AV *overlay_av;
217 int x, y, w, h; 251 int x, y, w, h;
218 int border; 252 int border;
219 text_t **text; 253 text_t **text;
220 rend_t **rend; 254 rend_t **rend;
221 255
256public:
257 HV *self;
258
222 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);
223 ~overlay (); 260 ~overlay ();
224 261
225 void show (); 262 void show ();
226 void hide (); 263 void hide ();
229 266
230 void set (int x, int y, SV *str, SV *rend); 267 void set (int x, int y, SV *str, SV *rend);
231}; 268};
232 269
233overlay::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)
234: 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)
235{ 272{
273 if (w < 0) w = 0;
274 if (h < 0) h = 0;
275
236 if (border == 2) 276 if (border == 2)
237 { 277 {
238 w += 2; 278 w += 2;
239 h += 2; 279 h += 2;
240 } 280 }
278 *rp++ = r; 318 *rp++ = r;
279 } 319 }
280 } 320 }
281 321
282 show (); 322 show ();
283 THIS->want_refresh = 1;
284} 323}
285 324
286overlay::~overlay () 325overlay::~overlay ()
287{ 326{
288 hide (); 327 hide ();
293 delete [] rend[y]; 332 delete [] rend[y];
294 } 333 }
295 334
296 delete [] text; 335 delete [] text;
297 delete [] rend; 336 delete [] rend;
337}
338
339void
340overlay::show ()
341{
342 if (overlay_av)
343 return;
344
345 overlay_av = (AV *)SvREFCNT_inc (SvRV (
346 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
347 ));
348 av_push (overlay_av, newSViv ((long)this));
298 349
299 THIS->want_refresh = 1; 350 THIS->want_refresh = 1;
300} 351}
301 352
302void 353void
303overlay::show ()
304{
305 char key[33]; sprintf (key, "%32lx", (long)this);
306
307 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
308 hv_store (hv, key, 32, newSViv ((long)this), 0);
309}
310
311void
312overlay::hide () 354overlay::hide ()
313{ 355{
314 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 356 if (!overlay_av)
357 return;
315 358
316 if (ovs) 359 int i;
317 {
318 char key[33]; sprintf (key, "%32lx", (long)this);
319 360
320 HV *hv = (HV *)SvRV (*ovs); 361 for (i = AvFILL (overlay_av); i >= 0; i--)
321 hv_delete (hv, key, 32, G_DISCARD); 362 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
322 } 363 break;
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;
323} 374}
324 375
325void overlay::swap () 376void overlay::swap ()
326{ 377{
327 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));
367 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 418 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
368 croak ("rend must be arrayref"); 419 croak ("rend must be arrayref");
369 420
370 AV *av = (AV *)SvRV (rend); 421 AV *av = (AV *)SvRV (rend);
371 422
372 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 423 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
373 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 424 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
374 } 425 }
375 426
376 THIS->want_refresh = 1; 427 THIS->want_refresh = 1;
377} 428}
433 484
434 if (perl) 485 if (perl)
435 { 486 {
436 // runs outside of perls ENV 487 // runs outside of perls ENV
437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 488 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
438 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);
439 } 490 }
440} 491}
441 492
442static void 493static void
443ungrab (rxvt_term *THIS) 494ungrab (rxvt_term *THIS)
444{ 495{
445 if (THIS->perl.grabtime) 496 if (THIS->perl.grabtime)
446 { 497 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 498 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 499 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 500 THIS->perl.grabtime = 0;
450 } 501 }
451} 502}
452 503
453static void
454swap_overlays (rxvt_term *term)
455{
456 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
457
458 if (HvKEYS (hv))
459 {
460 hv_iterinit (hv);
461
462 while (HE *he = hv_iternext (hv))
463 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
464 }
465}
466
467bool 504bool
468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 505rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
469{ 506{
470 if (!perl || !term->perl.self) 507 if (!perl || !term->perl.self)
471 return false; 508 return false;
472 509
473 // pre-handling of some events 510 // pre-handling of some events
474 if (htype == HOOK_REFRESH_END) 511 if (htype == HOOK_REFRESH_END)
475 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 }
476 518
477 swap (perl_environ, environ); 519 swap (perl_environ, environ);
478 520
479 bool event_consumed; 521 bool event_consumed;
480 522
513 break; 555 break;
514 556
515 case DT_STR_LEN: 557 case DT_STR_LEN:
516 { 558 {
517 char *str = va_arg (ap, char *); 559 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int); 560 int len = va_arg (ap, int);
519 561
520 XPUSHs (sv_2mortal (newSVpvn (str, len))); 562 XPUSHs (sv_2mortal (newSVpvn (str, len)));
521 } 563 }
522 break; 564 break;
523 565
524 case DT_WCS_LEN: 566 case DT_WCS_LEN:
525 { 567 {
526 wchar_t *wstr = va_arg (ap, wchar_t *); 568 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int); 569 int wlen = va_arg (ap, int);
528 570
529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 }
573 break;
574
575 case DT_LCS_LEN:
576 {
577 long *lstr = va_arg (ap, long *);
578 int llen = va_arg (ap, int);
579
580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
530 } 581 }
531 break; 582 break;
532 583
533 case DT_XEVENT: 584 case DT_XEVENT:
534 { 585 {
535 XEvent *xe = va_arg (ap, XEvent *); 586 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV (); 587 HV *hv = newHV ();
537 588
538# 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)
539# 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)
540# undef set 592# undef set
541 593
542 setiv (type, xe->type); 594 setiv (type, xe->type);
543 setiv (send_event, xe->xany.send_event); 595 setiv (send_event, xe->xany.send_event);
544 setiv (serial, xe->xany.serial); 596 setiv (serial, xe->xany.serial);
545 597
548 case KeyPress: 600 case KeyPress:
549 case KeyRelease: 601 case KeyRelease:
550 case ButtonPress: 602 case ButtonPress:
551 case ButtonRelease: 603 case ButtonRelease:
552 case MotionNotify: 604 case MotionNotify:
605 setuv (window, xe->xmotion.window);
606 setuv (root, xe->xmotion.root);
607 setuv (subwindow, xe->xmotion.subwindow);
553 setiv (time, xe->xmotion.time); 608 setuv (time, xe->xmotion.time);
554 setiv (x, xe->xmotion.x); 609 setiv (x, xe->xmotion.x);
555 setiv (y, xe->xmotion.y); 610 setiv (y, xe->xmotion.y);
556 setiv (row, xe->xmotion.y / term->fheight); 611 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
557 setiv (col, xe->xmotion.x / term->fwidth); 612 setiv (col, xe->xmotion.x / term->fwidth);
558 setiv (x_root, xe->xmotion.x_root); 613 setiv (x_root, xe->xmotion.x_root);
559 setiv (y_root, xe->xmotion.y_root); 614 setiv (y_root, xe->xmotion.y_root);
560 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
561 break; 634 break;
562 }
563 635
636 case MapNotify:
637 case UnmapNotify:
638 case ConfigureNotify:
639 setuv (event, xe->xconfigure.event);
640 setuv (window, xe->xconfigure.window);
641
564 switch (xe->type) 642 switch (xe->type)
565 { 643 {
566 case KeyPress: 644 case ConfigureNotify:
567 case KeyRelease: 645 setiv (x, xe->xconfigure.x);
568 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
569 break; 653 break;
570 654
571 case ButtonPress: 655 case PropertyNotify:
572 case ButtonRelease: 656 setuv (window, xe->xproperty.window);
573 setiv (button, xe->xbutton.button); 657 setuv (atom, xe->xproperty.atom);
658 setuv (time, xe->xproperty.time);
659 setiv (state, xe->xproperty.state);
574 break; 660 break;
575 661
576 case MotionNotify: 662 case ClientMessage:
577 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]);
578 break; 671 break;
579 } 672 }
580 673
581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 674 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
582 } 675 }
623 else 716 else
624 event_consumed = false; 717 event_consumed = false;
625 718
626 // post-handling of some events 719 // post-handling of some events
627 if (htype == HOOK_REFRESH_BEGIN) 720 if (htype == HOOK_REFRESH_BEGIN)
628 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 }
629 else if (htype == HOOK_DESTROY) 727 else if (htype == HOOK_DESTROY)
630 { 728 {
631 clearSVptr ((SV *)term->perl.self); 729 clearSVptr ((SV *)term->perl.self);
632 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;
633 } 734 }
634 735
635 swap (perl_environ, environ); 736 swap (perl_environ, environ);
636 737
637 return event_consumed; 738 return event_consumed;
661# include "optinc.h" 762# include "optinc.h"
662# undef nodef 763# undef nodef
663# undef def 764# undef def
664 765
665 HV *stash = gv_stashpv ("urxvt", 1); 766 HV *stash = gv_stashpv ("urxvt", 1);
666 struct { 767 static const struct {
667 const char *name; 768 const char *name;
668 IV iv; 769 IV iv;
669 } *civ, const_iv[] = { 770 } *civ, const_iv[] = {
670# define const_iv(name) { # name, (IV)name } 771# define const_iv(name) { # name, (IV)name }
671 const_iv (DEFAULT_RSTYLE), 772 const_iv (DEFAULT_RSTYLE),
689 const_iv (Button2Mask), 790 const_iv (Button2Mask),
690 const_iv (Button3Mask), 791 const_iv (Button3Mask),
691 const_iv (Button4Mask), 792 const_iv (Button4Mask),
692 const_iv (Button5Mask), 793 const_iv (Button5Mask),
693 const_iv (AnyModifier), 794 const_iv (AnyModifier),
795
796 const_iv (NoSymbol),
797 const_iv (GrabModeSync),
798 const_iv (GrabModeAsync),
694 799
695 const_iv (EVENT_NONE), 800 const_iv (EVENT_NONE),
696 const_iv (EVENT_READ), 801 const_iv (EVENT_READ),
697 const_iv (EVENT_WRITE), 802 const_iv (EVENT_WRITE),
698 803
754 const_iv (SelectionRequest), 859 const_iv (SelectionRequest),
755 const_iv (SelectionNotify), 860 const_iv (SelectionNotify),
756 const_iv (ColormapNotify), 861 const_iv (ColormapNotify),
757 const_iv (ClientMessage), 862 const_iv (ClientMessage),
758 const_iv (MappingNotify), 863 const_iv (MappingNotify),
864# if ENABLE_XIM_ONTHESPOT
865 const_iv (XIMReverse),
866 const_iv (XIMUnderline),
867 const_iv (XIMHighlight),
868 const_iv (XIMPrimary),
869 const_iv (XIMSecondary),
870 const_iv (XIMTertiary),
871 const_iv (XIMVisibleToForward),
872 const_iv (XIMVisibleToBackword),
873 const_iv (XIMVisibleToCenter),
874# if 0
875 const_iv (XIMForwardChar),
876 const_iv (XIMBackwardChar),
877 const_iv (XIMForwardWord),
878 const_iv (XIMBackwardWord),
879 const_iv (XIMCaretUp),
880 const_iv (XIMCaretDown),
881 const_iv (XIMNextLine),
882 const_iv (XIMPreviousLine),
883 const_iv (XIMLineStart),
884 const_iv (XIMLineEnd),
885 const_iv (XIMAbsolutePosition),
886 const_iv (XIMDontChange),
887# endif
888# endif
759 }; 889 };
760 890
761 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 891 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
762 civ-- > const_iv; )
763 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 892 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
764} 893}
765 894
766void 895void
767warn (const char *msg) 896warn (const char *msg)
798 RETVAL 927 RETVAL
799 928
800int 929int
801SET_FGCOLOR (int rend, int new_color) 930SET_FGCOLOR (int rend, int new_color)
802 CODE: 931 CODE:
803 RETVAL = SET_FGCOLOR (rend, new_color); 932 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
804 OUTPUT: 933 OUTPUT:
805 RETVAL 934 RETVAL
806 935
807int 936int
808SET_BGCOLOR (int rend, int new_color) 937SET_BGCOLOR (int rend, int new_color)
809 CODE: 938 CODE:
810 RETVAL = SET_BGCOLOR (rend, new_color); 939 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
811 OUTPUT: 940 OUTPUT:
812 RETVAL 941 RETVAL
813 942
814int 943int
815GET_CUSTOM (int rend) 944GET_CUSTOM (int rend)
829 | ((new_value << RS_customShift) & RS_customMask); 958 | ((new_value << RS_customShift) & RS_customMask);
830} 959}
831 OUTPUT: 960 OUTPUT:
832 RETVAL 961 RETVAL
833 962
963void
964termlist ()
965 PPCODE:
966{
967 EXTEND (SP, rxvt_term::termlist.size ());
968
969 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
970 if ((*t)->perl.self)
971 PUSHs (sv_2mortal (newSVterm (*t)));
972}
973
834MODULE = urxvt PACKAGE = urxvt::term 974MODULE = urxvt PACKAGE = urxvt::term
835 975
836SV * 976SV *
837_new (...) 977_new (AV *env, AV *arg)
838 CODE: 978 CODE:
839{ 979{
840 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
841 croak ("first argument to urxvt::term->_new must be arrayref");
842
843 rxvt_term *term = new rxvt_term; 980 rxvt_term *term = new rxvt_term;
844 981
845 term->argv = new stringvec; 982 stringvec *argv = new stringvec;
846 term->envv = new stringvec; 983 stringvec *envv = new stringvec;
847 984
848 for (int i = 1; i < items; i++) 985 for (int i = 0; i <= AvFILL (arg); i++)
849 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 986 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
850 987
851 AV *envv = (AV *)SvRV (ST (0));
852 for (int i = av_len (envv) + 1; i--; ) 988 for (int i = AvFILL (env) + 1; i--; )
853 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 989 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
854 990
855 term->envv->push_back (0); 991 envv->push_back (0);
856 992
857 bool success; 993 bool success;
858 994
859 try 995 try
860 { 996 {
861 success = term->init (term->argv->size (), term->argv->begin ()); 997 success = term->init (argv, envv);
862 } 998 }
863 catch (const class rxvt_failure_exception &e) 999 catch (const class rxvt_failure_exception &e)
864 { 1000 {
865 success = false; 1001 success = false;
866 } 1002 }
878 RETVAL 1014 RETVAL
879 1015
880void 1016void
881rxvt_term::destroy () 1017rxvt_term::destroy ()
882 1018
883#if ENABLE_PERL_FRILLS
884
885void
886rxvt_term::XListProperties (U32 window)
887 PPCODE:
888{
889 int count;
890 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
891
892 EXTEND (SP, count);
893 while (count--)
894 PUSHs (newSVuv ((U32)props [count]));
895
896 XFree (props);
897}
898
899void
900rxvt_term::XGetWindowProperty (U32 window, U32 property)
901 PPCODE:
902{
903 Atom type;
904 int format;
905 unsigned long nitems;
906 unsigned long bytes_after;
907 unsigned char *prop;
908 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
909 0, 1<<30, 0, AnyPropertyType,
910 &type, &format, &nitems, &bytes_after, &prop);
911 if (type != None)
912 {
913 EXTEND (SP, 3);
914 PUSHs (newSVuv ((U32)type));
915 PUSHs (newSViv (format));
916 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
917 XFree (prop);
918 }
919}
920
921void
922rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
923 CODE:
924{
925 STRLEN len;
926 char *data_ = SvPVbyte (data, len);
927
928 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
929 type, format, PropModeReplace,
930 (unsigned char *)data, len * 8 / format);
931}
932
933void
934rxvt_term::XDeleteProperty (U32 window, U32 property)
935 CODE:
936 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
937
938U32
939rxvt_term::DefaultRootWindow ()
940 CODE:
941 RETVAL = (U32)THIS->display->root;
942 OUTPUT:
943 RETVAL
944
945U32
946rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
947 CODE:
948 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
949 x, y, width, height, 0,
950 THIS->pix_colors_focused[Color_border],
951 THIS->pix_colors_focused[Color_border]);
952 OUTPUT:
953 RETVAL
954
955void
956rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
957 CODE:
958 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
959
960void
961rxvt_term::XMapWindow (U32 window)
962 CODE:
963 XMapWindow (THIS->display->display, (Window)window);
964
965void
966rxvt_term::XUnmapWindow (U32 window)
967 CODE:
968 XUnmapWindow (THIS->display->display, (Window)window);
969
970#endif
971
972void 1019void
973rxvt_term::set_should_invoke (int htype, int inc) 1020rxvt_term::set_should_invoke (int htype, int inc)
974 CODE: 1021 CODE:
975 THIS->perl.should_invoke [htype] += inc; 1022 THIS->perl.should_invoke [htype] += inc;
976 1023
977void 1024int
978rxvt_term::grab_button (int button, U32 modifiers) 1025rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
979 CODE: 1026 CODE:
980 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 1027 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
981 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1028 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
982 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 1029 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
1030 OUTPUT: RETVAL
1031
1032int
1033rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
1034 CODE:
1035 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
1036 OUTPUT: RETVAL
1037
1038void
1039rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
1040 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
1041 CODE:
1042 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
1043
1044void
1045rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
1046 CODE:
1047 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1048
1049void
1050rxvt_term::XUngrabKeyboard (Time eventtime)
1051 CODE:
1052 XUngrabKeyboard (THIS->dpy, eventtime);
983 1053
984bool 1054bool
985rxvt_term::grab (U32 eventtime, int sync = 0) 1055rxvt_term::grab (Time eventtime, int sync = 0)
986 CODE: 1056 CODE:
987{ 1057{
988 int mode = sync ? GrabModeSync : GrabModeAsync; 1058 int mode = sync ? GrabModeSync : GrabModeAsync;
989 1059
990 THIS->perl.grabtime = 0; 1060 THIS->perl.grabtime = 0;
991 1061
992 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 1062 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
993 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 1063 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
994 mode, mode, None, GRAB_CURSOR, eventtime)) 1064 mode, mode, None, GRAB_CURSOR, eventtime))
995 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 1065 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
996 THIS->perl.grabtime = eventtime; 1066 THIS->perl.grabtime = eventtime;
997 else 1067 else
998 XUngrabPointer (THIS->display->display, eventtime); 1068 XUngrabPointer (THIS->dpy, eventtime);
999 1069
1000 RETVAL = !!THIS->perl.grabtime; 1070 RETVAL = !!THIS->perl.grabtime;
1001} 1071}
1002 OUTPUT: 1072 OUTPUT:
1003 RETVAL 1073 RETVAL
1004 1074
1005void 1075void
1006rxvt_term::allow_events_async () 1076rxvt_term::allow_events_async ()
1007 CODE: 1077 CODE:
1008 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 1078 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1009 1079
1010void 1080void
1011rxvt_term::allow_events_sync () 1081rxvt_term::allow_events_sync ()
1012 CODE: 1082 CODE:
1013 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 1083 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1014 1084
1015void 1085void
1016rxvt_term::allow_events_replay () 1086rxvt_term::allow_events_replay ()
1017 CODE: 1087 CODE:
1018 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 1088 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1019 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 1089 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1020 1090
1021void 1091void
1022rxvt_term::ungrab () 1092rxvt_term::ungrab ()
1023 CODE: 1093 CODE:
1024 ungrab (THIS); 1094 ungrab (THIS);
1095
1096int
1097rxvt_term::XStringToKeysym (char *string)
1098 CODE:
1099 RETVAL = XStringToKeysym (string);
1100 OUTPUT: RETVAL
1101
1102char *
1103rxvt_term::XKeysymToString (int sym)
1104 CODE:
1105 RETVAL = XKeysymToString (sym);
1106 OUTPUT: RETVAL
1107
1108int
1109rxvt_term::XKeysymToKeycode (int sym)
1110 CODE:
1111 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
1112 OUTPUT: RETVAL
1113
1114int
1115rxvt_term::XKeycodeToKeysym (int code, int index)
1116 CODE:
1117 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
1118 OUTPUT: RETVAL
1025 1119
1026int 1120int
1027rxvt_term::strwidth (SV *str) 1121rxvt_term::strwidth (SV *str)
1028 CODE: 1122 CODE:
1029{ 1123{
1082#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1176#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1083#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1177#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1084#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1178#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1085#define TERM_OFFSET_focus TERM_OFFSET(focus) 1179#define TERM_OFFSET_focus TERM_OFFSET(focus)
1086#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1180#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1181#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1182#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1183#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1087#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1184#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1088#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1185#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1089#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1186#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1090 1187
1091int 1188int
1098 fbase = TERM_OFFSET_fbase 1195 fbase = TERM_OFFSET_fbase
1099 nrow = TERM_OFFSET_nrow 1196 nrow = TERM_OFFSET_nrow
1100 ncol = TERM_OFFSET_ncol 1197 ncol = TERM_OFFSET_ncol
1101 focus = TERM_OFFSET_focus 1198 focus = TERM_OFFSET_focus
1102 mapped = TERM_OFFSET_mapped 1199 mapped = TERM_OFFSET_mapped
1200 int_bwidth = TERM_OFFSET_int_bwidth
1201 ext_bwidth = TERM_OFFSET_ext_bwidth
1202 lineSpace = TERM_OFFSET_lineSpace
1103 saveLines = TERM_OFFSET_saveLines 1203 saveLines = TERM_OFFSET_saveLines
1104 total_rows = TERM_OFFSET_total_rows 1204 total_rows = TERM_OFFSET_total_rows
1105 top_row = TERM_OFFSET_top_row 1205 top_row = TERM_OFFSET_top_row
1106 CODE: 1206 CODE:
1107 RETVAL = *(int *)((char *)THIS + ix); 1207 RETVAL = *(int *)((char *)THIS + ix);
1112rxvt_term::ModLevel3Mask () 1212rxvt_term::ModLevel3Mask ()
1113 ALIAS: 1213 ALIAS:
1114 ModLevel3Mask = 0 1214 ModLevel3Mask = 0
1115 ModMetaMask = 1 1215 ModMetaMask = 1
1116 ModNumLockMask = 2 1216 ModNumLockMask = 2
1217 current_screen = 3
1218 hidden_cursor = 4
1117 CODE: 1219 CODE:
1118 switch (ix) 1220 switch (ix)
1119 { 1221 {
1120 case 0: RETVAL = THIS->ModLevel3Mask; break; 1222 case 0: RETVAL = THIS->ModLevel3Mask; break;
1121 case 1: RETVAL = THIS->ModMetaMask; break; 1223 case 1: RETVAL = THIS->ModMetaMask; break;
1122 case 2: RETVAL = THIS->ModNumLockMask; break; 1224 case 2: RETVAL = THIS->ModNumLockMask; break;
1225 case 3: RETVAL = THIS->current_screen; break;
1226 case 4: RETVAL = THIS->hidden_cursor; break;
1123 } 1227 }
1124 OUTPUT: 1228 OUTPUT:
1125 RETVAL 1229 RETVAL
1126 1230
1127char * 1231char *
1137 } 1241 }
1138 OUTPUT: 1242 OUTPUT:
1139 RETVAL 1243 RETVAL
1140 1244
1141SV * 1245SV *
1142rxvt_term::_env () 1246rxvt_term::envv ()
1247 ALIAS:
1248 argv = 1
1143 CODE: 1249 PPCODE:
1144{ 1250{
1145 if (THIS->envv) 1251 stringvec *vec = ix ? THIS->argv : THIS->envv;
1146 {
1147 AV *av = newAV ();
1148 1252
1253 EXTEND (SP, vec->size ());
1254
1149 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1255 for (char **i = vec->begin (); i != vec->end (); ++i)
1150 if (*i) 1256 if (*i)
1151 av_push (av, newSVpv (*i, 0)); 1257 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1152
1153 RETVAL = newRV_noinc ((SV *)av);
1154 }
1155 else
1156 RETVAL = &PL_sv_undef;
1157} 1258}
1158 OUTPUT:
1159 RETVAL
1160 1259
1161int 1260int
1162rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1261rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1163 CODE: 1262 CODE:
1164 RETVAL = THIS->pty_ev.events; 1263 RETVAL = THIS->pty_ev.events;
1165 if (events != EVENT_UNDEF) 1264 if (events != EVENT_UNDEF)
1166 THIS->pty_ev.set (events); 1265 THIS->pty_ev.set (events);
1167 OUTPUT: 1266 OUTPUT:
1168 RETVAL 1267 RETVAL
1169 1268
1170U32 1269int
1270rxvt_term::pty_fd ()
1271 CODE:
1272 RETVAL = THIS->pty->pty;
1273 OUTPUT:
1274 RETVAL
1275
1276Window
1171rxvt_term::parent () 1277rxvt_term::parent ()
1172 CODE: 1278 CODE:
1173 RETVAL = (U32)THIS->parent [0]; 1279 RETVAL = THIS->parent [0];
1174 OUTPUT: 1280 OUTPUT:
1175 RETVAL 1281 RETVAL
1176 1282
1177U32 1283Window
1178rxvt_term::vt () 1284rxvt_term::vt ()
1179 CODE: 1285 CODE:
1180 RETVAL = (U32)THIS->vt; 1286 RETVAL = THIS->vt;
1181 OUTPUT: 1287 OUTPUT:
1182 RETVAL 1288 RETVAL
1183 1289
1184void 1290void
1185rxvt_term::vt_emask_add (U32 emask) 1291rxvt_term::vt_emask_add (U32 emask)
1207} 1313}
1208 OUTPUT: 1314 OUTPUT:
1209 RETVAL 1315 RETVAL
1210 1316
1211void 1317void
1318rxvt_term::focus_in ()
1319
1320void
1321rxvt_term::focus_out ()
1322
1323void
1324rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1325 ALIAS:
1326 key_release = 1
1327 CODE:
1328{
1329 XKeyEvent xkey;
1330
1331 memset (&xkey, 0, sizeof (xkey));
1332
1333 xkey.time = time;
1334 xkey.state = state;
1335 xkey.keycode = keycode;
1336
1337 xkey.type = ix ? KeyRelease : KeyPress;
1338 xkey.display = THIS->dpy;
1339 xkey.window = THIS->vt;
1340 xkey.root = THIS->display->root;
1341 xkey.subwindow = THIS->vt;
1342
1343 if (ix)
1344 THIS->key_release (xkey);
1345 else
1346 THIS->key_press (xkey);
1347}
1348
1349void
1212rxvt_term::want_refresh () 1350rxvt_term::want_refresh ()
1213 CODE: 1351 CODE:
1214 THIS->want_refresh = 1; 1352 THIS->want_refresh = 1;
1215 1353
1216void 1354void
1222 1360
1223 line_t &l = ROW(row_number); 1361 line_t &l = ROW(row_number);
1224 1362
1225 if (GIMME_V != G_VOID) 1363 if (GIMME_V != G_VOID)
1226 { 1364 {
1227 wchar_t *wstr = new wchar_t [THIS->ncol]; 1365 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1228 1366
1229 for (int col = 0; col < THIS->ncol; col++) 1367 for (int col = 0; col < THIS->ncol; col++)
1230 wstr [col] = l.t [col]; 1368 wstr [col] = l.t [col];
1231 1369
1232 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1370 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1233
1234 delete [] wstr;
1235 } 1371 }
1236 1372
1237 if (new_text) 1373 if (new_text)
1238 { 1374 {
1239 wchar_t *wstr = sv2wcs (new_text); 1375 wchar_t *wstr = sv2wcs (new_text);
1240 1376
1241 int len = min (wcslen (wstr) - start_ofs, max_len); 1377 int len = min (wcslen (wstr) - start_ofs, max_len);
1242 1378
1243 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1379 if (start_col < 0 || start_col + len > THIS->ncol)
1244 { 1380 {
1245 free (wstr); 1381 free (wstr);
1246 croak ("new_text extends beyond horizontal margins"); 1382 croak ("new_text extends beyond horizontal margins");
1247 } 1383 }
1248 1384
1280 { 1416 {
1281 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1417 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1282 croak ("new_rend must be arrayref"); 1418 croak ("new_rend must be arrayref");
1283 1419
1284 AV *av = (AV *)SvRV (new_rend); 1420 AV *av = (AV *)SvRV (new_rend);
1285 int len = min (av_len (av) + 1 - start_ofs, max_len); 1421 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1286 1422
1287 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1423 if (start_col < 0 || start_col + len > THIS->ncol)
1288 croak ("new_rend array extends beyond horizontal margins"); 1424 croak ("new_rend array extends beyond horizontal margins");
1289 1425
1290 for (int col = start_col; col < start_col + len; col++) 1426 for (int col = start_col; col < start_col + len; col++)
1291 { 1427 {
1292 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1428 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1332rxvt_term::special_encode (SV *string) 1468rxvt_term::special_encode (SV *string)
1333 CODE: 1469 CODE:
1334{ 1470{
1335 wchar_t *wstr = sv2wcs (string); 1471 wchar_t *wstr = sv2wcs (string);
1336 int wlen = wcslen (wstr); 1472 int wlen = wcslen (wstr);
1337 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1473 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1338 1474
1339 rxvt_push_locale (THIS->locale); 1475 rxvt_push_locale (THIS->locale);
1340 1476
1341 wchar_t *r = rstr; 1477 wchar_t *r = rstr;
1342 for (wchar_t *s = wstr; *s; s++) 1478 for (wchar_t *s = wstr; *s; s++)
1479 {
1480 int w = WCWIDTH (*s);
1481
1343 if (wcwidth (*s) == 0) 1482 if (w == 0)
1344 { 1483 {
1345 if (r == rstr) 1484 if (r == rstr)
1346 croak ("leading combining character unencodable"); 1485 croak ("leading combining character unencodable");
1347 1486
1348 unicode_t n = rxvt_compose (r[-1], *s); 1487 unicode_t n = rxvt_compose (r[-1], *s);
1349 if (n == NOCHAR) 1488 if (n == NOCHAR)
1350 n = rxvt_composite.compose (r[-1], *s); 1489 n = rxvt_composite.compose (r[-1], *s);
1351 1490
1352 r[-1] = n; 1491 r[-1] = n;
1353 } 1492 }
1354#if !UNICODE_3 1493#if !UNICODE_3
1355 else if (*s >= 0x10000) 1494 else if (*s >= 0x10000)
1356 *r++ = rxvt_composite.compose (*s); 1495 *r++ = rxvt_composite.compose (*s);
1357#endif 1496#endif
1358 else 1497 else
1359 *r++ = *s; 1498 *r++ = *s;
1499
1500 // the *2 above only allows wcwidth <= 2
1501 if (w > 1)
1502 *r++ = NOCHAR;
1503 }
1360 1504
1361 rxvt_pop_locale (); 1505 rxvt_pop_locale ();
1362 1506
1363 RETVAL = wcs2sv (rstr, r - rstr); 1507 RETVAL = wcs2sv (rstr, r - rstr);
1364
1365 delete [] rstr;
1366} 1508}
1367 OUTPUT: 1509 OUTPUT:
1368 RETVAL 1510 RETVAL
1369 1511
1370SV * 1512SV *
1382 else if (IS_COMPOSE (*s)) 1524 else if (IS_COMPOSE (*s))
1383 dlen += rxvt_composite.expand (*s, 0); 1525 dlen += rxvt_composite.expand (*s, 0);
1384 else 1526 else
1385 dlen++; 1527 dlen++;
1386 1528
1387 wchar_t *rstr = new wchar_t [dlen]; 1529 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1388 1530
1389 // decode 1531 // decode
1390 wchar_t *r = rstr; 1532 wchar_t *r = rstr;
1391 for (wchar_t *s = wstr; *s; s++) 1533 for (wchar_t *s = wstr; *s; s++)
1392 if (*s == NOCHAR) 1534 if (*s == NOCHAR)
1395 r += rxvt_composite.expand (*s, r); 1537 r += rxvt_composite.expand (*s, r);
1396 else 1538 else
1397 *r++ = *s; 1539 *r++ = *s;
1398 1540
1399 RETVAL = wcs2sv (rstr, r - rstr); 1541 RETVAL = wcs2sv (rstr, r - rstr);
1400
1401 delete [] rstr;
1402} 1542}
1403 OUTPUT: 1543 OUTPUT:
1404 RETVAL 1544 RETVAL
1405 1545
1406void 1546void
1407rxvt_term::_resource (char *name, int index, SV *newval = 0) 1547rxvt_term::_resource (char *name, int index, SV *newval = 0)
1408 PPCODE: 1548 PPCODE:
1409{ 1549{
1410 struct resval { const char *name; int value; } rslist [] = { 1550 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1411# define def(name) { # name, Rs_ ## name }, 1551# define def(name) { # name, Rs_ ## name },
1412# define reserve(name,count) 1552# define reserve(name,count)
1413# include "rsinc.h" 1553# include "rsinc.h"
1414# undef def 1554# undef def
1415# undef reserve 1555# undef reserve
1416 }; 1556 };
1417 1557
1418 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1558 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1419 1559
1420 do { 1560 do {
1421 if (rs-- == rslist) 1561 if (rs-- == rslist)
1422 croak ("no such resource '%s', requested", name); 1562 croak ("no such resource '%s', requested", name);
1423 } while (strcmp (name, rs->name)); 1563 } while (strcmp (name, rs->name));
1457 if (set) 1597 if (set)
1458 THIS->options |= optval; 1598 THIS->options |= optval;
1459 else 1599 else
1460 THIS->options &= ~optval; 1600 THIS->options &= ~optval;
1461 1601
1602 if (THIS->check_ev.is_active ()) // avoid doing this before START
1462 switch (optval) 1603 switch (optval)
1463 { 1604 {
1464 case Opt_skipBuiltinGlyphs: 1605 case Opt_skipBuiltinGlyphs:
1465 THIS->set_fonts (); 1606 THIS->set_fonts ();
1466 THIS->scr_remap_chars (); 1607 THIS->scr_remap_chars ();
1467 THIS->scr_touch (true); 1608 THIS->scr_touch (true);
1468 THIS->want_refresh = 1; 1609 THIS->want_refresh = 1;
1469 break; 1610 break;
1470 1611
1471 case Opt_cursorUnderline: 1612 case Opt_cursorUnderline:
1472 THIS->want_refresh = 1; 1613 THIS->want_refresh = 1;
1473 break; 1614 break;
1474 1615
1475# case Opt_scrollBar_floating: 1616# case Opt_scrollBar_floating:
1476# case Opt_scrollBar_right: 1617# case Opt_scrollBar_right:
1477# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1618# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1478# break; 1619# break;
1479 } 1620 }
1480 } 1621 }
1481} 1622}
1482 OUTPUT: 1623 OUTPUT:
1483 RETVAL 1624 RETVAL
1484 1625
1515 if (items == 3) 1656 if (items == 3)
1516 { 1657 {
1517 rc.row = SvIV (ST (1)); 1658 rc.row = SvIV (ST (1));
1518 rc.col = SvIV (ST (2)); 1659 rc.col = SvIV (ST (2));
1519 1660
1520 if (ix == 2 && rc.col == 0) 1661 if (ix == 2)
1521 { 1662 {
1663 if (rc.col == 0)
1664 {
1665 // col == 0 means end of previous line
1522 rc.row--; 1666 rc.row--;
1523 rc.col = THIS->ncol; 1667 rc.col = THIS->ncol;
1668 }
1669 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1670 && rc.col > ROW(rc.row).l)
1671 {
1672 // col >= length means while line and add newline
1673 rc.col = THIS->ncol;
1674 }
1524 } 1675 }
1525 1676
1526 clamp_it (rc.col, 0, THIS->ncol); 1677 clamp_it (rc.col, 0, THIS->ncol);
1527 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1678 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1528 1679
1536 CODE: 1687 CODE:
1537 RETVAL = THIS->charsets [THIS->screen.charset]; 1688 RETVAL = THIS->charsets [THIS->screen.charset];
1538 OUTPUT: 1689 OUTPUT:
1539 RETVAL 1690 RETVAL
1540 1691
1541#void 1692void
1542#rxvt_term::selection_clear () 1693rxvt_term::selection_clear ()
1543 1694
1544void 1695void
1545rxvt_term::selection_make (U32 eventtime, bool rect = false) 1696rxvt_term::selection_make (Time eventtime, bool rect = false)
1546 CODE: 1697 CODE:
1547 THIS->selection.op = SELECTION_CONT; 1698 THIS->selection.op = SELECTION_CONT;
1548 THIS->selection.rect = rect; 1699 THIS->selection.rect = rect;
1549 THIS->selection_make (eventtime); 1700 THIS->selection_make (eventtime);
1550 1701
1551int 1702int
1552rxvt_term::selection_grab (U32 eventtime) 1703rxvt_term::selection_grab (Time eventtime)
1553 1704
1554void 1705void
1555rxvt_term::selection (SV *newtext = 0) 1706rxvt_term::selection (SV *newtext = 0)
1556 PPCODE: 1707 PPCODE:
1557{ 1708{
1575void 1726void
1576rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1727rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1577 1728
1578void 1729void
1579rxvt_term::scr_bell () 1730rxvt_term::scr_bell ()
1731
1732void
1733rxvt_term::scr_change_screen (int screen)
1580 1734
1581void 1735void
1582rxvt_term::scr_add_lines (SV *string) 1736rxvt_term::scr_add_lines (SV *string)
1583 CODE: 1737 CODE:
1584{ 1738{
1625 o->self = (HV *)SvRV (RETVAL); 1779 o->self = (HV *)SvRV (RETVAL);
1626} 1780}
1627 OUTPUT: 1781 OUTPUT:
1628 RETVAL 1782 RETVAL
1629 1783
1784#############################################################################
1785# Various X Utility Functions
1786#############################################################################
1787
1788void
1789rxvt_term::XListProperties (Window window)
1790 PPCODE:
1791{
1792 int count;
1793 Atom *props = XListProperties (THIS->dpy, window, &count);
1794
1795 EXTEND (SP, count);
1796 while (count--)
1797 PUSHs (newSVuv ((U32)props [count]));
1798
1799 XFree (props);
1800}
1801
1802void
1803rxvt_term::XGetWindowProperty (Window window, Atom property)
1804 PPCODE:
1805{
1806 Atom type;
1807 int format;
1808 unsigned long nitems;
1809 unsigned long bytes_after;
1810 unsigned char *prop;
1811
1812 XGetWindowProperty (THIS->dpy, window, property,
1813 0, 1<<24, 0, AnyPropertyType,
1814 &type, &format, &nitems, &bytes_after, &prop);
1815
1816 if (type != None)
1817 {
1818 int elemsize = format == 16 ? sizeof (short)
1819 : format == 32 ? sizeof (long)
1820 : 1;
1821
1822 EXTEND (SP, 3);
1823 PUSHs (newSVuv ((U32)type));
1824 PUSHs (newSViv (format));
1825 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1826 XFree (prop);
1827 }
1828}
1829
1830void
1831rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1832 CODE:
1833{
1834 STRLEN len;
1835 char *data_ = SvPVbyte (data, len);
1836
1837 int elemsize = format == 16 ? sizeof (short)
1838 : format == 32 ? sizeof (long)
1839 : 1;
1840
1841 XChangeProperty (THIS->dpy, window, property,
1842 type, format, PropModeReplace,
1843 (unsigned char *)data_, len / elemsize);
1844}
1845
1846Atom
1847XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1848 C_ARGS: term->dpy, atom_name, only_if_exists
1849
1850char *
1851XGetAtomName (rxvt_term *term, Atom atom)
1852 C_ARGS: term->dpy, atom
1853 CLEANUP:
1854 XFree (RETVAL);
1855
1856void
1857XDeleteProperty (rxvt_term *term, Window window, Atom property)
1858 C_ARGS: term->dpy, window, property
1859
1860Window
1861rxvt_term::DefaultRootWindow ()
1862 CODE:
1863 RETVAL = THIS->display->root;
1864 OUTPUT:
1865 RETVAL
1866
1867#if 0
1868
1869Window
1870XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1871 C_ARGS: term->dpy, (Window)parent,
1872 x, y, width, height, 0,
1873 term->pix_colors_focused[Color_border],
1874 term->pix_colors_focused[Color_border]
1875
1876#endif
1877
1878void
1879XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1880 C_ARGS: term->dpy, window, parent, x, y
1881
1882void
1883XMapWindow (rxvt_term *term, Window window)
1884 C_ARGS: term->dpy, window
1885
1886void
1887XUnmapWindow (rxvt_term *term, Window window)
1888 C_ARGS: term->dpy, window
1889
1890void
1891XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1892 C_ARGS: term->dpy, window, x, y, width, height
1893
1894void
1895rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1896 CODE:
1897{
1898 XWindowAttributes attr;
1899 XGetWindowAttributes (THIS->dpy, window, &attr);
1900 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1901}
1902
1903void
1904rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1905 PPCODE:
1906{
1907 int dx, dy;
1908 Window child;
1909
1910 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1911 {
1912 EXTEND (SP, 3);
1913 PUSHs (newSViv (dx));
1914 PUSHs (newSViv (dy));
1915 PUSHs (newSVuv (child));
1916 }
1917}
1918
1919#############################################################################
1920# urxvt::overlay
1921#############################################################################
1922
1630MODULE = urxvt PACKAGE = urxvt::overlay 1923MODULE = urxvt PACKAGE = urxvt::overlay
1631 1924
1632void 1925void
1633overlay::set (int x, int y, SV *text, SV *rend = 0) 1926overlay::set (int x, int y, SV *text, SV *rend = 0)
1634 1927
1638void 1931void
1639overlay::hide () 1932overlay::hide ()
1640 1933
1641void 1934void
1642overlay::DESTROY () 1935overlay::DESTROY ()
1936
1937#############################################################################
1938# urxvt::watcher
1939#############################################################################
1940
1941MODULE = urxvt PACKAGE = urxvt::watcher
1942
1943CHAINED
1944perl_watcher::cb (SV *cb)
1945 CODE:
1946 THIS->cb (cb);
1947 OUTPUT:
1948 RETVAL
1949
1950#############################################################################
1951# urxvt::timer
1952#############################################################################
1643 1953
1644MODULE = urxvt PACKAGE = urxvt::timer 1954MODULE = urxvt PACKAGE = urxvt::timer
1645 1955
1646SV * 1956SV *
1647timer::new () 1957timer::new ()
1648 CODE: 1958 CODE:
1649 timer *w = new timer; 1959 timer *w = new timer;
1650 w->start (NOW); 1960 w->start (NOW);
1651 RETVAL = newSVptr ((void *)w, "urxvt::timer"); 1961 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1652 w->self = (HV *)SvRV (RETVAL); 1962 w->self = (HV *)SvRV (RETVAL);
1653 OUTPUT:
1654 RETVAL
1655
1656timer *
1657timer::cb (SV *cb)
1658 CODE:
1659 THIS->cb (cb);
1660 RETVAL = THIS;
1661 OUTPUT: 1963 OUTPUT:
1662 RETVAL 1964 RETVAL
1663 1965
1664NV 1966NV
1665timer::at () 1967timer::at ()
1666 CODE: 1968 CODE:
1667 RETVAL = THIS->at; 1969 RETVAL = THIS->at;
1668 OUTPUT: 1970 OUTPUT:
1669 RETVAL 1971 RETVAL
1670 1972
1671timer * 1973CHAINED
1672timer::interval (NV interval) 1974timer::interval (NV interval)
1673 CODE: 1975 CODE:
1674 THIS->interval = interval; 1976 THIS->interval = interval;
1977 OUTPUT:
1675 RETVAL = THIS; 1978 RETVAL
1676 OUTPUT:
1677 RETVAL
1678 1979
1679timer * 1980CHAINED
1680timer::set (NV tstamp) 1981timer::set (NV tstamp)
1681 CODE: 1982 CODE:
1682 THIS->set (tstamp); 1983 THIS->set (tstamp);
1984 OUTPUT:
1683 RETVAL = THIS; 1985 RETVAL
1684 OUTPUT:
1685 RETVAL
1686 1986
1687timer * 1987CHAINED
1688timer::start (NV tstamp = THIS->at) 1988timer::start (NV tstamp = THIS->at)
1689 CODE: 1989 CODE:
1690 THIS->start (tstamp); 1990 THIS->start (tstamp);
1991 OUTPUT:
1691 RETVAL = THIS; 1992 RETVAL
1692 OUTPUT:
1693 RETVAL
1694 1993
1695timer * 1994CHAINED
1995timer::after (NV delay)
1996 CODE:
1997 THIS->start (NOW + delay);
1998 OUTPUT:
1999 RETVAL
2000
2001CHAINED
1696timer::stop () 2002timer::stop ()
1697 CODE: 2003 CODE:
1698 THIS->stop (); 2004 THIS->stop ();
1699 RETVAL = THIS;
1700 OUTPUT: 2005 OUTPUT:
1701 RETVAL 2006 RETVAL
1702 2007
1703void 2008void
1704timer::DESTROY () 2009timer::DESTROY ()
2010
2011#############################################################################
2012# urxvt::iow
2013#############################################################################
1705 2014
1706MODULE = urxvt PACKAGE = urxvt::iow 2015MODULE = urxvt PACKAGE = urxvt::iow
1707 2016
1708SV * 2017SV *
1709iow::new () 2018iow::new ()
1710 CODE: 2019 CODE:
1711 iow *w = new iow; 2020 iow *w = new iow;
1712 RETVAL = newSVptr ((void *)w, "urxvt::iow"); 2021 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
1713 w->self = (HV *)SvRV (RETVAL); 2022 w->self = (HV *)SvRV (RETVAL);
1714 OUTPUT: 2023 OUTPUT:
1715 RETVAL 2024 RETVAL
1716 2025
1717iow * 2026CHAINED
1718iow::cb (SV *cb)
1719 CODE:
1720 THIS->cb (cb);
1721 RETVAL = THIS;
1722 OUTPUT:
1723 RETVAL
1724
1725iow *
1726iow::fd (int fd) 2027iow::fd (int fd)
1727 CODE: 2028 CODE:
1728 THIS->fd = fd; 2029 THIS->fd = fd;
2030 OUTPUT:
1729 RETVAL = THIS; 2031 RETVAL
1730 OUTPUT:
1731 RETVAL
1732 2032
1733iow * 2033CHAINED
1734iow::events (short events) 2034iow::events (short events)
1735 CODE: 2035 CODE:
1736 THIS->events = events; 2036 THIS->events = events;
2037 OUTPUT:
1737 RETVAL = THIS; 2038 RETVAL
1738 OUTPUT:
1739 RETVAL
1740 2039
1741iow * 2040CHAINED
1742iow::start () 2041iow::start ()
1743 CODE: 2042 CODE:
1744 THIS->start (); 2043 THIS->start ();
2044 OUTPUT:
1745 RETVAL = THIS; 2045 RETVAL
1746 OUTPUT:
1747 RETVAL
1748 2046
1749iow * 2047CHAINED
1750iow::stop () 2048iow::stop ()
1751 CODE: 2049 CODE:
1752 THIS->stop (); 2050 THIS->stop ();
1753 RETVAL = THIS;
1754 OUTPUT: 2051 OUTPUT:
1755 RETVAL 2052 RETVAL
1756 2053
1757void 2054void
1758iow::DESTROY () 2055iow::DESTROY ()
1759 2056
2057#############################################################################
2058# urxvt::iw
2059#############################################################################
1760 2060
2061MODULE = urxvt PACKAGE = urxvt::iw
2062
2063SV *
2064iw::new ()
2065 CODE:
2066 iw *w = new iw;
2067 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2068 w->self = (HV *)SvRV (RETVAL);
2069 OUTPUT:
2070 RETVAL
2071
2072CHAINED
2073iw::start ()
2074 CODE:
2075 THIS->start ();
2076 OUTPUT:
2077 RETVAL
2078
2079CHAINED
2080iw::stop ()
2081 CODE:
2082 THIS->stop ();
2083 OUTPUT:
2084 RETVAL
2085
2086void
2087iw::DESTROY ()
2088
2089#############################################################################
2090# urxvt::pw
2091#############################################################################
2092
2093MODULE = urxvt PACKAGE = urxvt::pw
2094
2095SV *
2096pw::new ()
2097 CODE:
2098 pw *w = new pw;
2099 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2100 w->self = (HV *)SvRV (RETVAL);
2101 OUTPUT:
2102 RETVAL
2103
2104CHAINED
2105pw::start (int pid)
2106 CODE:
2107 THIS->start (pid);
2108 OUTPUT:
2109 RETVAL
2110
2111CHAINED
2112pw::stop ()
2113 CODE:
2114 THIS->stop ();
2115 OUTPUT:
2116 RETVAL
2117
2118void
2119pw::DESTROY ()
2120
2121

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines