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.75 by root, Wed Jan 18 11:05:09 2006 UTC vs.
Revision 1.113 by ayin, Tue May 1 21:10:04 2007 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
56
57///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
58 56
59static wchar_t * 57static wchar_t *
60sv2wcs (SV *sv) 58sv2wcs (SV *sv)
61{ 59{
80new_ref (HV *hv, const char *klass) 78new_ref (HV *hv, const char *klass)
81{ 79{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 80 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83} 81}
84 82
85//TODO: use magic
86static SV * 83static SV *
87newSVptr (void *ptr, const char *klass) 84newSVptr (void *ptr, const char *klass)
88{ 85{
89 HV *hv = newHV (); 86 HV *hv = newHV ();
90 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 87 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); 110 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
114 111
115 return (long)mg->mg_ptr; 112 return (long)mg->mg_ptr;
116} 113}
117 114
118#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self) 115#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
119#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 116#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
120 117
121///////////////////////////////////////////////////////////////////////////// 118/////////////////////////////////////////////////////////////////////////////
122 119
123struct perl_watcher
124{
125 SV *cbsv;
126 HV *self;
127
128 perl_watcher ()
129 : cbsv (newSV (0))
130 {
131 }
132
133 ~perl_watcher ()
134 {
135 SvREFCNT_dec (cbsv);
136 }
137
138 void cb (SV *cb)
139 {
140 sv_setsv (cbsv, cb);
141 }
142
143 void invoke (const char *type, SV *self, int arg = -1);
144};
145
146void
147perl_watcher::invoke (const char *type, SV *self, int arg)
148{
149 dSP;
150
151 ENTER;
152 SAVETMPS;
153
154 PUSHMARK (SP);
155
156 XPUSHs (sv_2mortal (self));
157
158 if (arg >= 0)
159 XPUSHs (sv_2mortal (newSViv (arg)));
160
161 PUTBACK;
162 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
163 SPAGAIN;
164
165 PUTBACK;
166 FREETMPS;
167 LEAVE;
168
169 if (SvTRUE (ERRSV))
170 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
171}
172
173#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
174#define SvTIMER(sv) (timer *)SvPTR (sv, "urxvt::timer")
175
176struct timer : time_watcher, perl_watcher
177{
178 tstamp interval;
179
180 timer ()
181 : time_watcher (this, &timer::execute)
182 {
183 }
184
185 void execute (time_watcher &w)
186 {
187 if (interval)
188 start (at + interval);
189
190 invoke ("urxvt::timer", newSVtimer (this));
191 }
192};
193
194#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
195#define SvIOW(sv) (iow *)SvPTR (sv, "urxvt::iow")
196
197struct iow : io_watcher, perl_watcher
198{
199 iow ()
200 : io_watcher (this, &iow::execute)
201 {
202 }
203
204 void execute (io_watcher &w, short revents)
205 {
206 invoke ("urxvt::iow", newSViow (this), revents);
207 }
208};
209
210/////////////////////////////////////////////////////////////////////////////
211
212#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 120#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
213 121
214struct overlay { 122class overlay {
215 HV *self;
216 rxvt_term *THIS; 123 rxvt_term *THIS;
124 AV *overlay_av;
217 int x, y, w, h; 125 int x, y, w, h;
218 int border; 126 int border;
219 text_t **text; 127 text_t **text;
220 rend_t **rend; 128 rend_t **rend;
221 129
130public:
131 HV *self;
132
222 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 133 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
223 ~overlay (); 134 ~overlay ();
224 135
225 void show (); 136 void show ();
226 void hide (); 137 void hide ();
229 140
230 void set (int x, int y, SV *str, SV *rend); 141 void set (int x, int y, SV *str, SV *rend);
231}; 142};
232 143
233overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 144overlay::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) 145: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0)
235{ 146{
147 if (w < 0) w = 0;
148 if (h < 0) h = 0;
149
236 if (border == 2) 150 if (border == 2)
237 { 151 {
238 w += 2; 152 w += 2;
239 h += 2; 153 h += 2;
240 } 154 }
278 *rp++ = r; 192 *rp++ = r;
279 } 193 }
280 } 194 }
281 195
282 show (); 196 show ();
283 THIS->want_refresh = 1;
284} 197}
285 198
286overlay::~overlay () 199overlay::~overlay ()
287{ 200{
288 hide (); 201 hide ();
293 delete [] rend[y]; 206 delete [] rend[y];
294 } 207 }
295 208
296 delete [] text; 209 delete [] text;
297 delete [] rend; 210 delete [] rend;
211}
212
213void
214overlay::show ()
215{
216 if (overlay_av)
217 return;
218
219 overlay_av = (AV *)SvREFCNT_inc (SvRV (
220 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
221 ));
222 av_push (overlay_av, newSViv ((long)this));
298 223
299 THIS->want_refresh = 1; 224 THIS->want_refresh = 1;
300} 225}
301 226
302void 227void
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 () 228overlay::hide ()
313{ 229{
314 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0); 230 if (!overlay_av)
231 return;
315 232
316 if (ovs) 233 int i;
317 {
318 char key[33]; sprintf (key, "%32lx", (long)this);
319 234
320 HV *hv = (HV *)SvRV (*ovs); 235 for (i = AvFILL (overlay_av); i >= 0; i--)
321 hv_delete (hv, key, 32, G_DISCARD); 236 if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
322 } 237 break;
238
239 for (; i < AvFILL (overlay_av); i++)
240 av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
241
242 av_pop (overlay_av);
243
244 SvREFCNT_dec (overlay_av);
245 overlay_av = 0;
246
247 THIS->want_refresh = 1;
323} 248}
324 249
325void overlay::swap () 250void overlay::swap ()
326{ 251{
327 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 252 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
367 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV) 292 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
368 croak ("rend must be arrayref"); 293 croak ("rend must be arrayref");
369 294
370 AV *av = (AV *)SvRV (rend); 295 AV *av = (AV *)SvRV (rend);
371 296
372 for (int col = min (av_len (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
373 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
374 } 299 }
375 300
376 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
377} 302}
378 303
304/////////////////////////////////////////////////////////////////////////////
305
306#define IOM_CLASS "urxvt"
307#define IOM_WARN rxvt_warn
308#include <iom_perl.h>
379 309
380///////////////////////////////////////////////////////////////////////////// 310/////////////////////////////////////////////////////////////////////////////
381 311
382struct rxvt_perl_interp rxvt_perl; 312struct rxvt_perl_interp rxvt_perl;
383 313
433 363
434 if (perl) 364 if (perl)
435 { 365 {
436 // runs outside of perls ENV 366 // runs outside of perls ENV
437 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 367 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); 368 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
439 } 369 }
440} 370}
441 371
442static void 372static void
443ungrab (rxvt_term *THIS) 373ungrab (rxvt_term *THIS)
444{ 374{
445 if (THIS->perl.grabtime) 375 if (THIS->perl.grabtime)
446 { 376 {
447 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 377 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
448 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 378 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
449 THIS->perl.grabtime = 0; 379 THIS->perl.grabtime = 0;
450 } 380 }
451} 381}
452 382
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 383bool
468rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 384rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
469{ 385{
470 if (!perl || !term->perl.self) 386 if (!perl || !term->perl.self)
471 return false; 387 return false;
472 388
473 // pre-handling of some events 389 // pre-handling of some events
474 if (htype == HOOK_REFRESH_END) 390 if (htype == HOOK_REFRESH_END)
475 swap_overlays (term); 391 {
392 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
393
394 for (int i = 0; i <= AvFILL (av); i++)
395 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
396 }
476 397
477 swap (perl_environ, environ); 398 swap (perl_environ, environ);
478 399
479 bool event_consumed; 400 bool event_consumed;
480 401
513 break; 434 break;
514 435
515 case DT_STR_LEN: 436 case DT_STR_LEN:
516 { 437 {
517 char *str = va_arg (ap, char *); 438 char *str = va_arg (ap, char *);
518 int len = va_arg (ap, int); 439 int len = va_arg (ap, int);
519 440
520 XPUSHs (sv_2mortal (newSVpvn (str, len))); 441 XPUSHs (sv_2mortal (newSVpvn (str, len)));
521 } 442 }
522 break; 443 break;
523 444
524 case DT_WCS_LEN: 445 case DT_WCS_LEN:
525 { 446 {
526 wchar_t *wstr = va_arg (ap, wchar_t *); 447 wchar_t *wstr = va_arg (ap, wchar_t *);
527 int wlen = va_arg (ap, int); 448 int wlen = va_arg (ap, int);
528 449
529 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 450 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
451 }
452 break;
453
454 case DT_LCS_LEN:
455 {
456 long *lstr = va_arg (ap, long *);
457 int llen = va_arg (ap, int);
458
459 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
530 } 460 }
531 break; 461 break;
532 462
533 case DT_XEVENT: 463 case DT_XEVENT:
534 { 464 {
535 XEvent *xe = va_arg (ap, XEvent *); 465 XEvent *xe = va_arg (ap, XEvent *);
536 HV *hv = newHV (); 466 HV *hv = newHV ();
537 467
538# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 468# 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) 469# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
540# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 470# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
541# undef set 471# undef set
542 472
543 setiv (type, xe->type); 473 setiv (type, xe->type);
544 setiv (send_event, xe->xany.send_event); 474 setiv (send_event, xe->xany.send_event);
545 setiv (serial, xe->xany.serial); 475 setiv (serial, xe->xany.serial);
546 476
555 setuv (root, xe->xmotion.root); 485 setuv (root, xe->xmotion.root);
556 setuv (subwindow, xe->xmotion.subwindow); 486 setuv (subwindow, xe->xmotion.subwindow);
557 setuv (time, xe->xmotion.time); 487 setuv (time, xe->xmotion.time);
558 setiv (x, xe->xmotion.x); 488 setiv (x, xe->xmotion.x);
559 setiv (y, xe->xmotion.y); 489 setiv (y, xe->xmotion.y);
560 setiv (row, xe->xmotion.y / term->fheight); 490 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
561 setiv (col, xe->xmotion.x / term->fwidth); 491 setiv (col, xe->xmotion.x / term->fwidth);
562 setiv (x_root, xe->xmotion.x_root); 492 setiv (x_root, xe->xmotion.x_root);
563 setiv (y_root, xe->xmotion.y_root); 493 setiv (y_root, xe->xmotion.y_root);
564 setuv (state, xe->xmotion.state); 494 setuv (state, xe->xmotion.state);
565 495
598 setuv (above, xe->xconfigure.above); 528 setuv (above, xe->xconfigure.above);
599 break; 529 break;
600 } 530 }
601 531
602 break; 532 break;
533
534 case PropertyNotify:
535 setuv (window, xe->xproperty.window);
536 setuv (atom, xe->xproperty.atom);
537 setuv (time, xe->xproperty.time);
538 setiv (state, xe->xproperty.state);
539 break;
540
541 case ClientMessage:
542 setuv (window, xe->xclient.window);
543 setuv (message_type, xe->xclient.message_type);
544 setuv (format, xe->xclient.format);
545 setuv (l0, xe->xclient.data.l[0]);
546 setuv (l1, xe->xclient.data.l[1]);
547 setuv (l2, xe->xclient.data.l[2]);
548 setuv (l3, xe->xclient.data.l[3]);
549 setuv (l4, xe->xclient.data.l[4]);
550 break;
603 } 551 }
604 552
605 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 553 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
606 } 554 }
607 break; 555 break;
647 else 595 else
648 event_consumed = false; 596 event_consumed = false;
649 597
650 // post-handling of some events 598 // post-handling of some events
651 if (htype == HOOK_REFRESH_BEGIN) 599 if (htype == HOOK_REFRESH_BEGIN)
652 swap_overlays (term); 600 {
601 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
602
603 for (int i = AvFILL (av); i >= 0; i--)
604 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
605 }
653 else if (htype == HOOK_DESTROY) 606 else if (htype == HOOK_DESTROY)
654 { 607 {
655 clearSVptr ((SV *)term->perl.self); 608 clearSVptr ((SV *)term->perl.self);
656 SvREFCNT_dec ((SV *)term->perl.self); 609 SvREFCNT_dec ((SV *)term->perl.self);
610
611 // don't allow further calls
612 term->perl.self = 0;
657 } 613 }
658 614
659 swap (perl_environ, environ); 615 swap (perl_environ, environ);
660 616
661 return event_consumed; 617 return event_consumed;
685# include "optinc.h" 641# include "optinc.h"
686# undef nodef 642# undef nodef
687# undef def 643# undef def
688 644
689 HV *stash = gv_stashpv ("urxvt", 1); 645 HV *stash = gv_stashpv ("urxvt", 1);
690 struct { 646 static const struct {
691 const char *name; 647 const char *name;
692 IV iv; 648 IV iv;
693 } *civ, const_iv[] = { 649 } *civ, const_iv[] = {
694# define const_iv(name) { # name, (IV)name } 650# define const_iv(name) { # name, (IV)name }
695 const_iv (DEFAULT_RSTYLE), 651 const_iv (DEFAULT_RSTYLE),
714 const_iv (Button3Mask), 670 const_iv (Button3Mask),
715 const_iv (Button4Mask), 671 const_iv (Button4Mask),
716 const_iv (Button5Mask), 672 const_iv (Button5Mask),
717 const_iv (AnyModifier), 673 const_iv (AnyModifier),
718 674
719 const_iv (EVENT_NONE), 675 const_iv (NoSymbol),
720 const_iv (EVENT_READ), 676 const_iv (GrabModeSync),
721 const_iv (EVENT_WRITE), 677 const_iv (GrabModeAsync),
722 678
723 const_iv (NoEventMask), 679 const_iv (NoEventMask),
724 const_iv (KeyPressMask), 680 const_iv (KeyPressMask),
725 const_iv (KeyReleaseMask), 681 const_iv (KeyReleaseMask),
726 const_iv (ButtonPressMask), 682 const_iv (ButtonPressMask),
778 const_iv (SelectionRequest), 734 const_iv (SelectionRequest),
779 const_iv (SelectionNotify), 735 const_iv (SelectionNotify),
780 const_iv (ColormapNotify), 736 const_iv (ColormapNotify),
781 const_iv (ClientMessage), 737 const_iv (ClientMessage),
782 const_iv (MappingNotify), 738 const_iv (MappingNotify),
739# if ENABLE_XIM_ONTHESPOT
740 const_iv (XIMReverse),
741 const_iv (XIMUnderline),
742 const_iv (XIMHighlight),
743 const_iv (XIMPrimary),
744 const_iv (XIMSecondary),
745 const_iv (XIMTertiary),
746 const_iv (XIMVisibleToForward),
747 const_iv (XIMVisibleToBackword),
748 const_iv (XIMVisibleToCenter),
749# if 0
750 const_iv (XIMForwardChar),
751 const_iv (XIMBackwardChar),
752 const_iv (XIMForwardWord),
753 const_iv (XIMBackwardWord),
754 const_iv (XIMCaretUp),
755 const_iv (XIMCaretDown),
756 const_iv (XIMNextLine),
757 const_iv (XIMPreviousLine),
758 const_iv (XIMLineStart),
759 const_iv (XIMLineEnd),
760 const_iv (XIMAbsolutePosition),
761 const_iv (XIMDontChange),
762# endif
763# endif
783 }; 764 };
784 765
785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); 766 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
786 civ-- > const_iv; )
787 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 767 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
788} 768}
789 769
790void 770void
791warn (const char *msg) 771warn (const char *msg)
822 RETVAL 802 RETVAL
823 803
824int 804int
825SET_FGCOLOR (int rend, int new_color) 805SET_FGCOLOR (int rend, int new_color)
826 CODE: 806 CODE:
827 RETVAL = SET_FGCOLOR (rend, new_color); 807 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
828 OUTPUT: 808 OUTPUT:
829 RETVAL 809 RETVAL
830 810
831int 811int
832SET_BGCOLOR (int rend, int new_color) 812SET_BGCOLOR (int rend, int new_color)
833 CODE: 813 CODE:
834 RETVAL = SET_BGCOLOR (rend, new_color); 814 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
835 OUTPUT: 815 OUTPUT:
836 RETVAL 816 RETVAL
837 817
838int 818int
839GET_CUSTOM (int rend) 819GET_CUSTOM (int rend)
840 CODE: 820 CODE:
841 RETVAL = (rend && RS_customMask) >> RS_customShift; 821 RETVAL = (rend & RS_customMask) >> RS_customShift;
842 OUTPUT: 822 OUTPUT:
843 RETVAL 823 RETVAL
844 824
845int 825int
846SET_CUSTOM (int rend, int new_value) 826SET_CUSTOM (int rend, int new_value)
853 | ((new_value << RS_customShift) & RS_customMask); 833 | ((new_value << RS_customShift) & RS_customMask);
854} 834}
855 OUTPUT: 835 OUTPUT:
856 RETVAL 836 RETVAL
857 837
838void
839termlist ()
840 PPCODE:
841{
842 EXTEND (SP, rxvt_term::termlist.size ());
843
844 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
845 if ((*t)->perl.self)
846 PUSHs (sv_2mortal (newSVterm (*t)));
847}
848
858MODULE = urxvt PACKAGE = urxvt::term 849MODULE = urxvt PACKAGE = urxvt::term
859 850
860SV * 851SV *
861_new (...) 852_new (AV *env, AV *arg)
862 CODE: 853 CODE:
863{ 854{
864 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
865 croak ("first argument to urxvt::term->_new must be arrayref");
866
867 rxvt_term *term = new rxvt_term; 855 rxvt_term *term = new rxvt_term;
868 856
869 term->argv = new stringvec; 857 stringvec *argv = new stringvec;
870 term->envv = new stringvec; 858 stringvec *envv = new stringvec;
871 859
872 for (int i = 1; i < items; i++) 860 for (int i = 0; i <= AvFILL (arg); i++)
873 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 861 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
874 862
875 AV *envv = (AV *)SvRV (ST (0));
876 for (int i = av_len (envv) + 1; i--; ) 863 for (int i = AvFILL (env) + 1; i--; )
877 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 864 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
878 865
879 term->envv->push_back (0); 866 envv->push_back (0);
880 867
881 bool success; 868 bool success;
882 869
883 try 870 try
884 { 871 {
885 success = term->init (term->argv->size (), term->argv->begin ()); 872 success = term->init (argv, envv);
886 } 873 }
887 catch (const class rxvt_failure_exception &e) 874 catch (const class rxvt_failure_exception &e)
888 { 875 {
889 success = false; 876 success = false;
890 } 877 }
902 RETVAL 889 RETVAL
903 890
904void 891void
905rxvt_term::destroy () 892rxvt_term::destroy ()
906 893
907#if ENABLE_PERL_FRILLS
908
909void
910rxvt_term::XListProperties (U32 window)
911 PPCODE:
912{
913 int count;
914 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
915
916 EXTEND (SP, count);
917 while (count--)
918 PUSHs (newSVuv ((U32)props [count]));
919
920 XFree (props);
921}
922
923void
924rxvt_term::XGetWindowProperty (U32 window, U32 property)
925 PPCODE:
926{
927 Atom type;
928 int format;
929 unsigned long nitems;
930 unsigned long bytes_after;
931 unsigned char *prop;
932 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
933 0, 1<<30, 0, AnyPropertyType,
934 &type, &format, &nitems, &bytes_after, &prop);
935 if (type != None)
936 {
937 EXTEND (SP, 3);
938 PUSHs (newSVuv ((U32)type));
939 PUSHs (newSViv (format));
940 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
941 XFree (prop);
942 }
943}
944
945void
946rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
947 CODE:
948{
949 STRLEN len;
950 char *data_ = SvPVbyte (data, len);
951
952 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
953 type, format, PropModeReplace,
954 (unsigned char *)data, len * 8 / format);
955}
956
957void
958rxvt_term::XDeleteProperty (U32 window, U32 property)
959 CODE:
960 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
961
962U32
963rxvt_term::DefaultRootWindow ()
964 CODE:
965 RETVAL = (U32)THIS->display->root;
966 OUTPUT:
967 RETVAL
968
969U32
970rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
971 CODE:
972 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
973 x, y, width, height, 0,
974 THIS->pix_colors_focused[Color_border],
975 THIS->pix_colors_focused[Color_border]);
976 OUTPUT:
977 RETVAL
978
979void
980rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
981 CODE:
982 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
983
984void
985rxvt_term::XMapWindow (U32 window)
986 CODE:
987 XMapWindow (THIS->display->display, (Window)window);
988
989void
990rxvt_term::XUnmapWindow (U32 window)
991 CODE:
992 XUnmapWindow (THIS->display->display, (Window)window);
993
994#endif
995
996void 894void
997rxvt_term::set_should_invoke (int htype, int inc) 895rxvt_term::set_should_invoke (int htype, int inc)
998 CODE: 896 CODE:
999 THIS->perl.should_invoke [htype] += inc; 897 THIS->perl.should_invoke [htype] += inc;
1000 898
1001void 899int
1002rxvt_term::grab_button (int button, U32 modifiers) 900rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1003 CODE: 901 CODE:
1004 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 902 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1005 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 903 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1006 GrabModeSync, GrabModeSync, None, GRAB_CURSOR); 904 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
905 OUTPUT: RETVAL
906
907int
908rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
909 CODE:
910 RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
911 OUTPUT: RETVAL
912
913void
914rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
915 int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
916 CODE:
917 XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
918
919void
920rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
921 CODE:
922 XUngrabKey (THIS->dpy, keycode, modifiers, window);
923
924void
925rxvt_term::XUngrabKeyboard (Time eventtime)
926 CODE:
927 XUngrabKeyboard (THIS->dpy, eventtime);
1007 928
1008bool 929bool
1009rxvt_term::grab (U32 eventtime, int sync = 0) 930rxvt_term::grab (Time eventtime, int sync = 0)
1010 CODE: 931 CODE:
1011{ 932{
1012 int mode = sync ? GrabModeSync : GrabModeAsync; 933 int mode = sync ? GrabModeSync : GrabModeAsync;
1013 934
1014 THIS->perl.grabtime = 0; 935 THIS->perl.grabtime = 0;
1015 936
1016 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 937 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1017 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 938 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1018 mode, mode, None, GRAB_CURSOR, eventtime)) 939 mode, mode, None, GRAB_CURSOR, eventtime))
1019 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 940 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1020 THIS->perl.grabtime = eventtime; 941 THIS->perl.grabtime = eventtime;
1021 else 942 else
1022 XUngrabPointer (THIS->display->display, eventtime); 943 XUngrabPointer (THIS->dpy, eventtime);
1023 944
1024 RETVAL = !!THIS->perl.grabtime; 945 RETVAL = !!THIS->perl.grabtime;
1025} 946}
1026 OUTPUT: 947 OUTPUT:
1027 RETVAL 948 RETVAL
1028 949
1029void 950void
1030rxvt_term::allow_events_async () 951rxvt_term::allow_events_async ()
1031 CODE: 952 CODE:
1032 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 953 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1033 954
1034void 955void
1035rxvt_term::allow_events_sync () 956rxvt_term::allow_events_sync ()
1036 CODE: 957 CODE:
1037 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 958 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1038 959
1039void 960void
1040rxvt_term::allow_events_replay () 961rxvt_term::allow_events_replay ()
1041 CODE: 962 CODE:
1042 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1043 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 964 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1044 965
1045void 966void
1046rxvt_term::ungrab () 967rxvt_term::ungrab ()
1047 CODE: 968 CODE:
1048 ungrab (THIS); 969 ungrab (THIS);
970
971int
972rxvt_term::XStringToKeysym (char *string)
973 CODE:
974 RETVAL = XStringToKeysym (string);
975 OUTPUT: RETVAL
976
977char *
978rxvt_term::XKeysymToString (int sym)
979 CODE:
980 RETVAL = XKeysymToString (sym);
981 OUTPUT: RETVAL
982
983int
984rxvt_term::XKeysymToKeycode (int sym)
985 CODE:
986 RETVAL = XKeysymToKeycode (THIS->dpy, sym);
987 OUTPUT: RETVAL
988
989int
990rxvt_term::XKeycodeToKeysym (int code, int index)
991 CODE:
992 RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
993 OUTPUT: RETVAL
1049 994
1050int 995int
1051rxvt_term::strwidth (SV *str) 996rxvt_term::strwidth (SV *str)
1052 CODE: 997 CODE:
1053{ 998{
1054 wchar_t *wstr = sv2wcs (str); 999 wchar_t *wstr = sv2wcs (str);
1055 1000
1056 rxvt_push_locale (THIS->locale); 1001 rxvt_push_locale (THIS->locale);
1057 RETVAL = wcswidth (wstr, wcslen (wstr)); 1002 RETVAL = 0;
1003 for (wchar_t *wc = wstr; *wc; wc++)
1004 {
1005 int w = WCWIDTH (*wc);
1006
1007 if (w)
1008 RETVAL += max (w, 1);
1009 }
1058 rxvt_pop_locale (); 1010 rxvt_pop_locale ();
1059 1011
1060 free (wstr); 1012 free (wstr);
1061} 1013}
1062 OUTPUT: 1014 OUTPUT:
1092 rxvt_pop_locale (); 1044 rxvt_pop_locale ();
1093 1045
1094 RETVAL = wcs2sv (wstr); 1046 RETVAL = wcs2sv (wstr);
1095 free (wstr); 1047 free (wstr);
1096} 1048}
1049 OUTPUT:
1050 RETVAL
1051
1052char *
1053rxvt_term::locale ()
1054 CODE:
1055 RETVAL = THIS->locale;
1097 OUTPUT: 1056 OUTPUT:
1098 RETVAL 1057 RETVAL
1099 1058
1100#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1101 1060
1106#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1065#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1107#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1066#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1108#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1067#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1109#define TERM_OFFSET_focus TERM_OFFSET(focus) 1068#define TERM_OFFSET_focus TERM_OFFSET(focus)
1110#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1069#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1070#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1071#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1072#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1111#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1112#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1113#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1114 1076
1115int 1077int
1122 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1123 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1124 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1125 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1126 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1089 int_bwidth = TERM_OFFSET_int_bwidth
1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1091 lineSpace = TERM_OFFSET_lineSpace
1127 saveLines = TERM_OFFSET_saveLines 1092 saveLines = TERM_OFFSET_saveLines
1128 total_rows = TERM_OFFSET_total_rows 1093 total_rows = TERM_OFFSET_total_rows
1129 top_row = TERM_OFFSET_top_row 1094 top_row = TERM_OFFSET_top_row
1130 CODE: 1095 CODE:
1131 RETVAL = *(int *)((char *)THIS + ix); 1096 RETVAL = *(int *)((char *)THIS + ix);
1136rxvt_term::ModLevel3Mask () 1101rxvt_term::ModLevel3Mask ()
1137 ALIAS: 1102 ALIAS:
1138 ModLevel3Mask = 0 1103 ModLevel3Mask = 0
1139 ModMetaMask = 1 1104 ModMetaMask = 1
1140 ModNumLockMask = 2 1105 ModNumLockMask = 2
1106 current_screen = 3
1107 hidden_cursor = 4
1141 CODE: 1108 CODE:
1142 switch (ix) 1109 switch (ix)
1143 { 1110 {
1144 case 0: RETVAL = THIS->ModLevel3Mask; break; 1111 case 0: RETVAL = THIS->ModLevel3Mask; break;
1145 case 1: RETVAL = THIS->ModMetaMask; break; 1112 case 1: RETVAL = THIS->ModMetaMask; break;
1146 case 2: RETVAL = THIS->ModNumLockMask; break; 1113 case 2: RETVAL = THIS->ModNumLockMask; break;
1114 case 3: RETVAL = THIS->current_screen; break;
1115 case 4: RETVAL = THIS->hidden_cursor; break;
1147 } 1116 }
1148 OUTPUT: 1117 OUTPUT:
1149 RETVAL 1118 RETVAL
1150 1119
1151char * 1120char *
1161 } 1130 }
1162 OUTPUT: 1131 OUTPUT:
1163 RETVAL 1132 RETVAL
1164 1133
1165SV * 1134SV *
1166rxvt_term::_env () 1135rxvt_term::envv ()
1136 ALIAS:
1137 argv = 1
1167 CODE: 1138 PPCODE:
1168{ 1139{
1169 if (THIS->envv) 1140 stringvec *vec = ix ? THIS->argv : THIS->envv;
1170 {
1171 AV *av = newAV ();
1172 1141
1142 EXTEND (SP, vec->size ());
1143
1173 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1144 for (char **i = vec->begin (); i != vec->end (); ++i)
1174 if (*i) 1145 if (*i)
1175 av_push (av, newSVpv (*i, 0)); 1146 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1176
1177 RETVAL = newRV_noinc ((SV *)av);
1178 }
1179 else
1180 RETVAL = &PL_sv_undef;
1181} 1147}
1182 OUTPUT:
1183 RETVAL
1184 1148
1185int 1149int
1186rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1150rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1187 CODE: 1151 CODE:
1188 RETVAL = THIS->pty_ev.events; 1152 RETVAL = THIS->pty_ev.events;
1189 if (events != EVENT_UNDEF) 1153 if (events != EVENT_UNDEF)
1190 THIS->pty_ev.set (events); 1154 THIS->pty_ev.set (events);
1191 OUTPUT: 1155 OUTPUT:
1192 RETVAL 1156 RETVAL
1193 1157
1194U32 1158int
1159rxvt_term::pty_fd ()
1160 CODE:
1161 RETVAL = THIS->pty->pty;
1162 OUTPUT:
1163 RETVAL
1164
1165Window
1195rxvt_term::parent () 1166rxvt_term::parent ()
1196 CODE: 1167 CODE:
1197 RETVAL = (U32)THIS->parent [0]; 1168 RETVAL = THIS->parent [0];
1198 OUTPUT: 1169 OUTPUT:
1199 RETVAL 1170 RETVAL
1200 1171
1201U32 1172Window
1202rxvt_term::vt () 1173rxvt_term::vt ()
1203 CODE: 1174 CODE:
1204 RETVAL = (U32)THIS->vt; 1175 RETVAL = THIS->vt;
1205 OUTPUT: 1176 OUTPUT:
1206 RETVAL 1177 RETVAL
1207 1178
1208void 1179void
1209rxvt_term::vt_emask_add (U32 emask) 1180rxvt_term::vt_emask_add (U32 emask)
1231} 1202}
1232 OUTPUT: 1203 OUTPUT:
1233 RETVAL 1204 RETVAL
1234 1205
1235void 1206void
1207rxvt_term::focus_in ()
1208
1209void
1210rxvt_term::focus_out ()
1211
1212void
1213rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
1214 ALIAS:
1215 key_release = 1
1216 CODE:
1217{
1218 XKeyEvent xkey;
1219
1220 memset (&xkey, 0, sizeof (xkey));
1221
1222 xkey.time = time;
1223 xkey.state = state;
1224 xkey.keycode = keycode;
1225
1226 xkey.type = ix ? KeyRelease : KeyPress;
1227 xkey.display = THIS->dpy;
1228 xkey.window = THIS->vt;
1229 xkey.root = THIS->display->root;
1230 xkey.subwindow = THIS->vt;
1231
1232 if (ix)
1233 THIS->key_release (xkey);
1234 else
1235 THIS->key_press (xkey);
1236}
1237
1238void
1236rxvt_term::want_refresh () 1239rxvt_term::want_refresh ()
1237 CODE: 1240 CODE:
1238 THIS->want_refresh = 1; 1241 THIS->want_refresh = 1;
1239 1242
1240void 1243void
1246 1249
1247 line_t &l = ROW(row_number); 1250 line_t &l = ROW(row_number);
1248 1251
1249 if (GIMME_V != G_VOID) 1252 if (GIMME_V != G_VOID)
1250 { 1253 {
1251 wchar_t *wstr = new wchar_t [THIS->ncol]; 1254 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1252 1255
1253 for (int col = 0; col < THIS->ncol; col++) 1256 for (int col = 0; col < THIS->ncol; col++)
1254 wstr [col] = l.t [col]; 1257 wstr [col] = l.t [col];
1255 1258
1256 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1259 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1257
1258 delete [] wstr;
1259 } 1260 }
1260 1261
1261 if (new_text) 1262 if (new_text)
1262 { 1263 {
1263 wchar_t *wstr = sv2wcs (new_text); 1264 wchar_t *wstr = sv2wcs (new_text);
1264 1265
1265 int len = min (wcslen (wstr) - start_ofs, max_len); 1266 int len = min (wcslen (wstr) - start_ofs, max_len);
1266 1267
1267 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1268 if (start_col < 0 || start_col + len > THIS->ncol)
1268 { 1269 {
1269 free (wstr); 1270 free (wstr);
1270 croak ("new_text extends beyond horizontal margins"); 1271 croak ("new_text extends beyond horizontal margins");
1271 } 1272 }
1272 1273
1304 { 1305 {
1305 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1306 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1306 croak ("new_rend must be arrayref"); 1307 croak ("new_rend must be arrayref");
1307 1308
1308 AV *av = (AV *)SvRV (new_rend); 1309 AV *av = (AV *)SvRV (new_rend);
1309 int len = min (av_len (av) + 1 - start_ofs, max_len); 1310 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1310 1311
1311 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1312 if (start_col < 0 || start_col + len > THIS->ncol)
1312 croak ("new_rend array extends beyond horizontal margins"); 1313 croak ("new_rend array extends beyond horizontal margins");
1313 1314
1314 for (int col = start_col; col < start_col + len; col++) 1315 for (int col = start_col; col < start_col + len; col++)
1315 { 1316 {
1316 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask; 1317 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
1356rxvt_term::special_encode (SV *string) 1357rxvt_term::special_encode (SV *string)
1357 CODE: 1358 CODE:
1358{ 1359{
1359 wchar_t *wstr = sv2wcs (string); 1360 wchar_t *wstr = sv2wcs (string);
1360 int wlen = wcslen (wstr); 1361 int wlen = wcslen (wstr);
1361 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1362 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1362 1363
1363 rxvt_push_locale (THIS->locale); 1364 rxvt_push_locale (THIS->locale);
1364 1365
1365 wchar_t *r = rstr; 1366 wchar_t *r = rstr;
1366 for (wchar_t *s = wstr; *s; s++) 1367 for (wchar_t *s = wstr; *s; s++)
1368 {
1369 int w = WCWIDTH (*s);
1370
1367 if (wcwidth (*s) == 0) 1371 if (w == 0)
1368 { 1372 {
1369 if (r == rstr) 1373 if (r == rstr)
1370 croak ("leading combining character unencodable"); 1374 croak ("leading combining character unencodable");
1371 1375
1372 unicode_t n = rxvt_compose (r[-1], *s); 1376 unicode_t n = rxvt_compose (r[-1], *s);
1373 if (n == NOCHAR) 1377 if (n == NOCHAR)
1374 n = rxvt_composite.compose (r[-1], *s); 1378 n = rxvt_composite.compose (r[-1], *s);
1375 1379
1376 r[-1] = n; 1380 r[-1] = n;
1377 } 1381 }
1378#if !UNICODE_3 1382#if !UNICODE_3
1379 else if (*s >= 0x10000) 1383 else if (*s >= 0x10000)
1380 *r++ = rxvt_composite.compose (*s); 1384 *r++ = rxvt_composite.compose (*s);
1381#endif 1385#endif
1382 else 1386 else
1383 *r++ = *s; 1387 *r++ = *s;
1388
1389 // the *2 above only allows wcwidth <= 2
1390 if (w > 1)
1391 *r++ = NOCHAR;
1392 }
1384 1393
1385 rxvt_pop_locale (); 1394 rxvt_pop_locale ();
1386 1395
1387 RETVAL = wcs2sv (rstr, r - rstr); 1396 RETVAL = wcs2sv (rstr, r - rstr);
1388
1389 delete [] rstr;
1390} 1397}
1391 OUTPUT: 1398 OUTPUT:
1392 RETVAL 1399 RETVAL
1393 1400
1394SV * 1401SV *
1406 else if (IS_COMPOSE (*s)) 1413 else if (IS_COMPOSE (*s))
1407 dlen += rxvt_composite.expand (*s, 0); 1414 dlen += rxvt_composite.expand (*s, 0);
1408 else 1415 else
1409 dlen++; 1416 dlen++;
1410 1417
1411 wchar_t *rstr = new wchar_t [dlen]; 1418 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1412 1419
1413 // decode 1420 // decode
1414 wchar_t *r = rstr; 1421 wchar_t *r = rstr;
1415 for (wchar_t *s = wstr; *s; s++) 1422 for (wchar_t *s = wstr; *s; s++)
1416 if (*s == NOCHAR) 1423 if (*s == NOCHAR)
1419 r += rxvt_composite.expand (*s, r); 1426 r += rxvt_composite.expand (*s, r);
1420 else 1427 else
1421 *r++ = *s; 1428 *r++ = *s;
1422 1429
1423 RETVAL = wcs2sv (rstr, r - rstr); 1430 RETVAL = wcs2sv (rstr, r - rstr);
1424
1425 delete [] rstr;
1426} 1431}
1427 OUTPUT: 1432 OUTPUT:
1428 RETVAL 1433 RETVAL
1429 1434
1430void 1435void
1431rxvt_term::_resource (char *name, int index, SV *newval = 0) 1436rxvt_term::_resource (char *name, int index, SV *newval = 0)
1432 PPCODE: 1437 PPCODE:
1433{ 1438{
1434 struct resval { const char *name; int value; } rslist [] = { 1439 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1435# define def(name) { # name, Rs_ ## name }, 1440# define def(name) { # name, Rs_ ## name },
1436# define reserve(name,count) 1441# define reserve(name,count)
1437# include "rsinc.h" 1442# include "rsinc.h"
1438# undef def 1443# undef def
1439# undef reserve 1444# undef reserve
1440 }; 1445 };
1441 1446
1442 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1447 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1443 1448
1444 do { 1449 do {
1445 if (rs-- == rslist) 1450 if (rs-- == rslist)
1446 croak ("no such resource '%s', requested", name); 1451 croak ("no such resource '%s', requested", name);
1447 } while (strcmp (name, rs->name)); 1452 } while (strcmp (name, rs->name));
1469 1474
1470const char * 1475const char *
1471rxvt_term::x_resource (const char *name) 1476rxvt_term::x_resource (const char *name)
1472 1477
1473bool 1478bool
1474rxvt_term::option (U32 optval, int set = -1) 1479rxvt_term::option (U8 optval, int set = -1)
1475 CODE: 1480 CODE:
1476{ 1481{
1477 RETVAL = THIS->options & optval; 1482 RETVAL = THIS->option (optval);
1478 1483
1479 if (set >= 0) 1484 if (set >= 0)
1480 { 1485 {
1481 if (set)
1482 THIS->options |= optval; 1486 THIS->set_option (optval, set);
1483 else
1484 THIS->options &= ~optval;
1485 1487
1488 if (THIS->check_ev.is_active ()) // avoid doing this before START
1486 switch (optval) 1489 switch (optval)
1487 { 1490 {
1488 case Opt_skipBuiltinGlyphs: 1491 case Opt_skipBuiltinGlyphs:
1489 THIS->set_fonts (); 1492 THIS->set_fonts ();
1490 THIS->scr_remap_chars (); 1493 THIS->scr_remap_chars ();
1491 THIS->scr_touch (true); 1494 THIS->scr_touch (true);
1492 THIS->want_refresh = 1; 1495 THIS->want_refresh = 1;
1493 break; 1496 break;
1494 1497
1495 case Opt_cursorUnderline: 1498 case Opt_cursorUnderline:
1496 THIS->want_refresh = 1; 1499 THIS->want_refresh = 1;
1497 break; 1500 break;
1498 1501
1499# case Opt_scrollBar_floating: 1502# case Opt_scrollBar_floating:
1500# case Opt_scrollBar_right: 1503# case Opt_scrollBar_right:
1501# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1504# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1502# break; 1505# break;
1503 } 1506 }
1504 } 1507 }
1505} 1508}
1506 OUTPUT: 1509 OUTPUT:
1507 RETVAL 1510 RETVAL
1508 1511
1539 if (items == 3) 1542 if (items == 3)
1540 { 1543 {
1541 rc.row = SvIV (ST (1)); 1544 rc.row = SvIV (ST (1));
1542 rc.col = SvIV (ST (2)); 1545 rc.col = SvIV (ST (2));
1543 1546
1544 if (ix == 2 && rc.col == 0) 1547 if (ix == 2)
1545 { 1548 {
1549 if (rc.col == 0)
1550 {
1551 // col == 0 means end of previous line
1546 rc.row--; 1552 rc.row--;
1547 rc.col = THIS->ncol; 1553 rc.col = THIS->ncol;
1554 }
1555 else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
1556 && rc.col > ROW(rc.row).l)
1557 {
1558 // col >= length means while line and add newline
1559 rc.col = THIS->ncol;
1560 }
1548 } 1561 }
1549 1562
1550 clamp_it (rc.col, 0, THIS->ncol); 1563 clamp_it (rc.col, 0, THIS->ncol);
1551 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1564 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1552 1565
1560 CODE: 1573 CODE:
1561 RETVAL = THIS->charsets [THIS->screen.charset]; 1574 RETVAL = THIS->charsets [THIS->screen.charset];
1562 OUTPUT: 1575 OUTPUT:
1563 RETVAL 1576 RETVAL
1564 1577
1565#void 1578void
1566#rxvt_term::selection_clear () 1579rxvt_term::selection_clear ()
1567 1580
1568void 1581void
1569rxvt_term::selection_make (U32 eventtime, bool rect = false) 1582rxvt_term::selection_make (Time eventtime, bool rect = false)
1570 CODE: 1583 CODE:
1571 THIS->selection.op = SELECTION_CONT; 1584 THIS->selection.op = SELECTION_CONT;
1572 THIS->selection.rect = rect; 1585 THIS->selection.rect = rect;
1573 THIS->selection_make (eventtime); 1586 THIS->selection_make (eventtime);
1574 1587
1575int 1588int
1576rxvt_term::selection_grab (U32 eventtime) 1589rxvt_term::selection_grab (Time eventtime)
1577 1590
1578void 1591void
1579rxvt_term::selection (SV *newtext = 0) 1592rxvt_term::selection (SV *newtext = 0)
1580 PPCODE: 1593 PPCODE:
1581{ 1594{
1599void 1612void
1600rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid) 1613rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1601 1614
1602void 1615void
1603rxvt_term::scr_bell () 1616rxvt_term::scr_bell ()
1617
1618void
1619rxvt_term::scr_change_screen (int screen)
1604 1620
1605void 1621void
1606rxvt_term::scr_add_lines (SV *string) 1622rxvt_term::scr_add_lines (SV *string)
1607 CODE: 1623 CODE:
1608{ 1624{
1649 o->self = (HV *)SvRV (RETVAL); 1665 o->self = (HV *)SvRV (RETVAL);
1650} 1666}
1651 OUTPUT: 1667 OUTPUT:
1652 RETVAL 1668 RETVAL
1653 1669
1670#############################################################################
1671# Various X Utility Functions
1672#############################################################################
1673
1674void
1675rxvt_term::XListProperties (Window window)
1676 PPCODE:
1677{
1678 int count;
1679 Atom *props = XListProperties (THIS->dpy, window, &count);
1680
1681 EXTEND (SP, count);
1682 while (count--)
1683 PUSHs (newSVuv ((U32)props [count]));
1684
1685 XFree (props);
1686}
1687
1688void
1689rxvt_term::XGetWindowProperty (Window window, Atom property)
1690 PPCODE:
1691{
1692 Atom type;
1693 int format;
1694 unsigned long nitems;
1695 unsigned long bytes_after;
1696 unsigned char *prop;
1697
1698 XGetWindowProperty (THIS->dpy, window, property,
1699 0, 1<<24, 0, AnyPropertyType,
1700 &type, &format, &nitems, &bytes_after, &prop);
1701
1702 if (type != None)
1703 {
1704 int elemsize = format == 16 ? sizeof (short)
1705 : format == 32 ? sizeof (long)
1706 : 1;
1707
1708 EXTEND (SP, 3);
1709 PUSHs (newSVuv ((U32)type));
1710 PUSHs (newSViv (format));
1711 PUSHs (newSVpvn ((char *)prop, nitems * elemsize));
1712 XFree (prop);
1713 }
1714}
1715
1716void
1717rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
1718 CODE:
1719{
1720 STRLEN len;
1721 char *data_ = SvPVbyte (data, len);
1722
1723 int elemsize = format == 16 ? sizeof (short)
1724 : format == 32 ? sizeof (long)
1725 : 1;
1726
1727 XChangeProperty (THIS->dpy, window, property,
1728 type, format, PropModeReplace,
1729 (unsigned char *)data_, len / elemsize);
1730}
1731
1732Atom
1733XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
1734 C_ARGS: term->dpy, atom_name, only_if_exists
1735
1736char *
1737XGetAtomName (rxvt_term *term, Atom atom)
1738 C_ARGS: term->dpy, atom
1739 CLEANUP:
1740 XFree (RETVAL);
1741
1742void
1743XDeleteProperty (rxvt_term *term, Window window, Atom property)
1744 C_ARGS: term->dpy, window, property
1745
1746Window
1747rxvt_term::DefaultRootWindow ()
1748 CODE:
1749 RETVAL = THIS->display->root;
1750 OUTPUT:
1751 RETVAL
1752
1753#if 0
1754
1755Window
1756XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
1757 C_ARGS: term->dpy, (Window)parent,
1758 x, y, width, height, 0,
1759 term->pix_colors_focused[Color_border],
1760 term->pix_colors_focused[Color_border]
1761
1762#endif
1763
1764void
1765XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
1766 C_ARGS: term->dpy, window, parent, x, y
1767
1768void
1769XMapWindow (rxvt_term *term, Window window)
1770 C_ARGS: term->dpy, window
1771
1772void
1773XUnmapWindow (rxvt_term *term, Window window)
1774 C_ARGS: term->dpy, window
1775
1776void
1777XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
1778 C_ARGS: term->dpy, window, x, y, width, height
1779
1780void
1781rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
1782 CODE:
1783{
1784 XWindowAttributes attr;
1785 XGetWindowAttributes (THIS->dpy, window, &attr);
1786 XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
1787}
1788
1789void
1790rxvt_term::XTranslateCoordinates (Window src, Window dst, int x, int y)
1791 PPCODE:
1792{
1793 int dx, dy;
1794 Window child;
1795
1796 if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
1797 {
1798 EXTEND (SP, 3);
1799 PUSHs (newSViv (dx));
1800 PUSHs (newSViv (dy));
1801 PUSHs (newSVuv (child));
1802 }
1803}
1804
1805#############################################################################
1806# urxvt::overlay
1807#############################################################################
1808
1654MODULE = urxvt PACKAGE = urxvt::overlay 1809MODULE = urxvt PACKAGE = urxvt::overlay
1655 1810
1656void 1811void
1657overlay::set (int x, int y, SV *text, SV *rend = 0) 1812overlay::set (int x, int y, SV *text, SV *rend = 0)
1658 1813
1663overlay::hide () 1818overlay::hide ()
1664 1819
1665void 1820void
1666overlay::DESTROY () 1821overlay::DESTROY ()
1667 1822
1668MODULE = urxvt PACKAGE = urxvt::timer 1823INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1669 1824
1670SV *
1671timer::new ()
1672 CODE:
1673 timer *w = new timer;
1674 w->start (NOW);
1675 RETVAL = newSVptr ((void *)w, "urxvt::timer");
1676 w->self = (HV *)SvRV (RETVAL);
1677 OUTPUT:
1678 RETVAL
1679
1680timer *
1681timer::cb (SV *cb)
1682 CODE:
1683 THIS->cb (cb);
1684 RETVAL = THIS;
1685 OUTPUT:
1686 RETVAL
1687
1688NV
1689timer::at ()
1690 CODE:
1691 RETVAL = THIS->at;
1692 OUTPUT:
1693 RETVAL
1694
1695timer *
1696timer::interval (NV interval)
1697 CODE:
1698 THIS->interval = interval;
1699 RETVAL = THIS;
1700 OUTPUT:
1701 RETVAL
1702
1703timer *
1704timer::set (NV tstamp)
1705 CODE:
1706 THIS->set (tstamp);
1707 RETVAL = THIS;
1708 OUTPUT:
1709 RETVAL
1710
1711timer *
1712timer::start (NV tstamp = THIS->at)
1713 CODE:
1714 THIS->start (tstamp);
1715 RETVAL = THIS;
1716 OUTPUT:
1717 RETVAL
1718
1719timer *
1720timer::after (NV delay)
1721 CODE:
1722 THIS->start (NOW + delay);
1723 OUTPUT:
1724 RETVAL
1725
1726timer *
1727timer::stop ()
1728 CODE:
1729 THIS->stop ();
1730 RETVAL = THIS;
1731 OUTPUT:
1732 RETVAL
1733
1734void
1735timer::DESTROY ()
1736
1737MODULE = urxvt PACKAGE = urxvt::iow
1738
1739SV *
1740iow::new ()
1741 CODE:
1742 iow *w = new iow;
1743 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1744 w->self = (HV *)SvRV (RETVAL);
1745 OUTPUT:
1746 RETVAL
1747
1748iow *
1749iow::cb (SV *cb)
1750 CODE:
1751 THIS->cb (cb);
1752 RETVAL = THIS;
1753 OUTPUT:
1754 RETVAL
1755
1756iow *
1757iow::fd (int fd)
1758 CODE:
1759 THIS->fd = fd;
1760 RETVAL = THIS;
1761 OUTPUT:
1762 RETVAL
1763
1764iow *
1765iow::events (short events)
1766 CODE:
1767 THIS->events = events;
1768 RETVAL = THIS;
1769 OUTPUT:
1770 RETVAL
1771
1772iow *
1773iow::start ()
1774 CODE:
1775 THIS->start ();
1776 RETVAL = THIS;
1777 OUTPUT:
1778 RETVAL
1779
1780iow *
1781iow::stop ()
1782 CODE:
1783 THIS->stop ();
1784 RETVAL = THIS;
1785 OUTPUT:
1786 RETVAL
1787
1788void
1789iow::DESTROY ()
1790
1791

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines