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.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)
470# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
540# undef set 471# undef set
541 472
542 setiv (type, xe->type); 473 setiv (type, xe->type);
543 setiv (send_event, xe->xany.send_event); 474 setiv (send_event, xe->xany.send_event);
544 setiv (serial, xe->xany.serial); 475 setiv (serial, xe->xany.serial);
545 476
548 case KeyPress: 479 case KeyPress:
549 case KeyRelease: 480 case KeyRelease:
550 case ButtonPress: 481 case ButtonPress:
551 case ButtonRelease: 482 case ButtonRelease:
552 case MotionNotify: 483 case MotionNotify:
484 setuv (window, xe->xmotion.window);
485 setuv (root, xe->xmotion.root);
486 setuv (subwindow, xe->xmotion.subwindow);
553 setiv (time, xe->xmotion.time); 487 setuv (time, xe->xmotion.time);
554 setiv (x, xe->xmotion.x); 488 setiv (x, xe->xmotion.x);
555 setiv (y, xe->xmotion.y); 489 setiv (y, xe->xmotion.y);
556 setiv (row, xe->xmotion.y / term->fheight); 490 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
557 setiv (col, xe->xmotion.x / term->fwidth); 491 setiv (col, xe->xmotion.x / term->fwidth);
558 setiv (x_root, xe->xmotion.x_root); 492 setiv (x_root, xe->xmotion.x_root);
559 setiv (y_root, xe->xmotion.y_root); 493 setiv (y_root, xe->xmotion.y_root);
560 setiv (state, xe->xmotion.state); 494 setuv (state, xe->xmotion.state);
495
496 switch (xe->type)
497 {
498 case KeyPress:
499 case KeyRelease:
500 setuv (keycode, xe->xkey.keycode);
501 break;
502
503 case ButtonPress:
504 case ButtonRelease:
505 setuv (button, xe->xbutton.button);
506 break;
507
508 case MotionNotify:
509 setiv (is_hint, xe->xmotion.is_hint);
510 break;
511 }
512
561 break; 513 break;
562 }
563 514
515 case MapNotify:
516 case UnmapNotify:
517 case ConfigureNotify:
518 setuv (event, xe->xconfigure.event);
519 setuv (window, xe->xconfigure.window);
520
564 switch (xe->type) 521 switch (xe->type)
565 { 522 {
566 case KeyPress: 523 case ConfigureNotify:
567 case KeyRelease: 524 setiv (x, xe->xconfigure.x);
568 setiv (keycode, xe->xkey.keycode); 525 setiv (y, xe->xconfigure.y);
526 setiv (width, xe->xconfigure.width);
527 setiv (height, xe->xconfigure.height);
528 setuv (above, xe->xconfigure.above);
529 break;
530 }
531
569 break; 532 break;
570 533
571 case ButtonPress: 534 case PropertyNotify:
572 case ButtonRelease: 535 setuv (window, xe->xproperty.window);
573 setiv (button, xe->xbutton.button); 536 setuv (atom, xe->xproperty.atom);
537 setuv (time, xe->xproperty.time);
538 setiv (state, xe->xproperty.state);
574 break; 539 break;
575 540
576 case MotionNotify: 541 case ClientMessage:
577 setiv (is_hint, xe->xmotion.is_hint); 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]);
578 break; 550 break;
579 } 551 }
580 552
581 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 553 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
582 } 554 }
623 else 595 else
624 event_consumed = false; 596 event_consumed = false;
625 597
626 // post-handling of some events 598 // post-handling of some events
627 if (htype == HOOK_REFRESH_BEGIN) 599 if (htype == HOOK_REFRESH_BEGIN)
628 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 }
629 else if (htype == HOOK_DESTROY) 606 else if (htype == HOOK_DESTROY)
630 { 607 {
631 clearSVptr ((SV *)term->perl.self); 608 clearSVptr ((SV *)term->perl.self);
632 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;
633 } 613 }
634 614
635 swap (perl_environ, environ); 615 swap (perl_environ, environ);
636 616
637 return event_consumed; 617 return event_consumed;
661# include "optinc.h" 641# include "optinc.h"
662# undef nodef 642# undef nodef
663# undef def 643# undef def
664 644
665 HV *stash = gv_stashpv ("urxvt", 1); 645 HV *stash = gv_stashpv ("urxvt", 1);
666 struct { 646 static const struct {
667 const char *name; 647 const char *name;
668 IV iv; 648 IV iv;
669 } *civ, const_iv[] = { 649 } *civ, const_iv[] = {
670# define const_iv(name) { # name, (IV)name } 650# define const_iv(name) { # name, (IV)name }
671 const_iv (DEFAULT_RSTYLE), 651 const_iv (DEFAULT_RSTYLE),
690 const_iv (Button3Mask), 670 const_iv (Button3Mask),
691 const_iv (Button4Mask), 671 const_iv (Button4Mask),
692 const_iv (Button5Mask), 672 const_iv (Button5Mask),
693 const_iv (AnyModifier), 673 const_iv (AnyModifier),
694 674
695 const_iv (EVENT_NONE), 675 const_iv (NoSymbol),
696 const_iv (EVENT_READ), 676 const_iv (GrabModeSync),
697 const_iv (EVENT_WRITE), 677 const_iv (GrabModeAsync),
698 678
699 const_iv (NoEventMask), 679 const_iv (NoEventMask),
700 const_iv (KeyPressMask), 680 const_iv (KeyPressMask),
701 const_iv (KeyReleaseMask), 681 const_iv (KeyReleaseMask),
702 const_iv (ButtonPressMask), 682 const_iv (ButtonPressMask),
754 const_iv (SelectionRequest), 734 const_iv (SelectionRequest),
755 const_iv (SelectionNotify), 735 const_iv (SelectionNotify),
756 const_iv (ColormapNotify), 736 const_iv (ColormapNotify),
757 const_iv (ClientMessage), 737 const_iv (ClientMessage),
758 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
759 }; 764 };
760 765
761 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; )
762 civ-- > const_iv; )
763 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 767 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
764} 768}
765 769
766void 770void
767warn (const char *msg) 771warn (const char *msg)
798 RETVAL 802 RETVAL
799 803
800int 804int
801SET_FGCOLOR (int rend, int new_color) 805SET_FGCOLOR (int rend, int new_color)
802 CODE: 806 CODE:
803 RETVAL = SET_FGCOLOR (rend, new_color); 807 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
804 OUTPUT: 808 OUTPUT:
805 RETVAL 809 RETVAL
806 810
807int 811int
808SET_BGCOLOR (int rend, int new_color) 812SET_BGCOLOR (int rend, int new_color)
809 CODE: 813 CODE:
810 RETVAL = SET_BGCOLOR (rend, new_color); 814 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
811 OUTPUT: 815 OUTPUT:
812 RETVAL 816 RETVAL
813 817
814int 818int
815GET_CUSTOM (int rend) 819GET_CUSTOM (int rend)
816 CODE: 820 CODE:
817 RETVAL = (rend && RS_customMask) >> RS_customShift; 821 RETVAL = (rend & RS_customMask) >> RS_customShift;
818 OUTPUT: 822 OUTPUT:
819 RETVAL 823 RETVAL
820 824
821int 825int
822SET_CUSTOM (int rend, int new_value) 826SET_CUSTOM (int rend, int new_value)
829 | ((new_value << RS_customShift) & RS_customMask); 833 | ((new_value << RS_customShift) & RS_customMask);
830} 834}
831 OUTPUT: 835 OUTPUT:
832 RETVAL 836 RETVAL
833 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
834MODULE = urxvt PACKAGE = urxvt::term 849MODULE = urxvt PACKAGE = urxvt::term
835 850
836SV * 851SV *
837_new (...) 852_new (AV *env, AV *arg)
838 CODE: 853 CODE:
839{ 854{
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; 855 rxvt_term *term = new rxvt_term;
844 856
845 term->argv = new stringvec; 857 stringvec *argv = new stringvec;
846 term->envv = new stringvec; 858 stringvec *envv = new stringvec;
847 859
848 for (int i = 1; i < items; i++) 860 for (int i = 0; i <= AvFILL (arg); i++)
849 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 861 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
850 862
851 AV *envv = (AV *)SvRV (ST (0));
852 for (int i = av_len (envv) + 1; i--; ) 863 for (int i = AvFILL (env) + 1; i--; )
853 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 864 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
854 865
855 term->envv->push_back (0); 866 envv->push_back (0);
856 867
857 bool success; 868 bool success;
858 869
859 try 870 try
860 { 871 {
861 success = term->init (term->argv->size (), term->argv->begin ()); 872 success = term->init (argv, envv);
862 } 873 }
863 catch (const class rxvt_failure_exception &e) 874 catch (const class rxvt_failure_exception &e)
864 { 875 {
865 success = false; 876 success = false;
866 } 877 }
878 RETVAL 889 RETVAL
879 890
880void 891void
881rxvt_term::destroy () 892rxvt_term::destroy ()
882 893
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 894void
973rxvt_term::set_should_invoke (int htype, int inc) 895rxvt_term::set_should_invoke (int htype, int inc)
974 CODE: 896 CODE:
975 THIS->perl.should_invoke [htype] += inc; 897 THIS->perl.should_invoke [htype] += inc;
976 898
977void 899int
978rxvt_term::grab_button (int button, U32 modifiers) 900rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
979 CODE: 901 CODE:
980 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 902 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
981 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 903 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
982 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);
983 928
984bool 929bool
985rxvt_term::grab (U32 eventtime, int sync = 0) 930rxvt_term::grab (Time eventtime, int sync = 0)
986 CODE: 931 CODE:
987{ 932{
988 int mode = sync ? GrabModeSync : GrabModeAsync; 933 int mode = sync ? GrabModeSync : GrabModeAsync;
989 934
990 THIS->perl.grabtime = 0; 935 THIS->perl.grabtime = 0;
991 936
992 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 937 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
993 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 938 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
994 mode, mode, None, GRAB_CURSOR, eventtime)) 939 mode, mode, None, GRAB_CURSOR, eventtime))
995 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 940 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
996 THIS->perl.grabtime = eventtime; 941 THIS->perl.grabtime = eventtime;
997 else 942 else
998 XUngrabPointer (THIS->display->display, eventtime); 943 XUngrabPointer (THIS->dpy, eventtime);
999 944
1000 RETVAL = !!THIS->perl.grabtime; 945 RETVAL = !!THIS->perl.grabtime;
1001} 946}
1002 OUTPUT: 947 OUTPUT:
1003 RETVAL 948 RETVAL
1004 949
1005void 950void
1006rxvt_term::allow_events_async () 951rxvt_term::allow_events_async ()
1007 CODE: 952 CODE:
1008 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 953 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1009 954
1010void 955void
1011rxvt_term::allow_events_sync () 956rxvt_term::allow_events_sync ()
1012 CODE: 957 CODE:
1013 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 958 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1014 959
1015void 960void
1016rxvt_term::allow_events_replay () 961rxvt_term::allow_events_replay ()
1017 CODE: 962 CODE:
1018 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1019 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 964 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1020 965
1021void 966void
1022rxvt_term::ungrab () 967rxvt_term::ungrab ()
1023 CODE: 968 CODE:
1024 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
1025 994
1026int 995int
1027rxvt_term::strwidth (SV *str) 996rxvt_term::strwidth (SV *str)
1028 CODE: 997 CODE:
1029{ 998{
1030 wchar_t *wstr = sv2wcs (str); 999 wchar_t *wstr = sv2wcs (str);
1031 1000
1032 rxvt_push_locale (THIS->locale); 1001 rxvt_push_locale (THIS->locale);
1033 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 }
1034 rxvt_pop_locale (); 1010 rxvt_pop_locale ();
1035 1011
1036 free (wstr); 1012 free (wstr);
1037} 1013}
1038 OUTPUT: 1014 OUTPUT:
1068 rxvt_pop_locale (); 1044 rxvt_pop_locale ();
1069 1045
1070 RETVAL = wcs2sv (wstr); 1046 RETVAL = wcs2sv (wstr);
1071 free (wstr); 1047 free (wstr);
1072} 1048}
1049 OUTPUT:
1050 RETVAL
1051
1052char *
1053rxvt_term::locale ()
1054 CODE:
1055 RETVAL = THIS->locale;
1073 OUTPUT: 1056 OUTPUT:
1074 RETVAL 1057 RETVAL
1075 1058
1076#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1077 1060
1082#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1065#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1083#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1066#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1084#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1067#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1085#define TERM_OFFSET_focus TERM_OFFSET(focus) 1068#define TERM_OFFSET_focus TERM_OFFSET(focus)
1086#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)
1087#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1088#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1089#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1090 1076
1091int 1077int
1098 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1099 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1100 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1101 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1102 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
1103 saveLines = TERM_OFFSET_saveLines 1092 saveLines = TERM_OFFSET_saveLines
1104 total_rows = TERM_OFFSET_total_rows 1093 total_rows = TERM_OFFSET_total_rows
1105 top_row = TERM_OFFSET_top_row 1094 top_row = TERM_OFFSET_top_row
1106 CODE: 1095 CODE:
1107 RETVAL = *(int *)((char *)THIS + ix); 1096 RETVAL = *(int *)((char *)THIS + ix);
1112rxvt_term::ModLevel3Mask () 1101rxvt_term::ModLevel3Mask ()
1113 ALIAS: 1102 ALIAS:
1114 ModLevel3Mask = 0 1103 ModLevel3Mask = 0
1115 ModMetaMask = 1 1104 ModMetaMask = 1
1116 ModNumLockMask = 2 1105 ModNumLockMask = 2
1106 current_screen = 3
1107 hidden_cursor = 4
1117 CODE: 1108 CODE:
1118 switch (ix) 1109 switch (ix)
1119 { 1110 {
1120 case 0: RETVAL = THIS->ModLevel3Mask; break; 1111 case 0: RETVAL = THIS->ModLevel3Mask; break;
1121 case 1: RETVAL = THIS->ModMetaMask; break; 1112 case 1: RETVAL = THIS->ModMetaMask; break;
1122 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;
1123 } 1116 }
1124 OUTPUT: 1117 OUTPUT:
1125 RETVAL 1118 RETVAL
1126 1119
1127char * 1120char *
1137 } 1130 }
1138 OUTPUT: 1131 OUTPUT:
1139 RETVAL 1132 RETVAL
1140 1133
1141SV * 1134SV *
1142rxvt_term::_env () 1135rxvt_term::envv ()
1136 ALIAS:
1137 argv = 1
1143 CODE: 1138 PPCODE:
1144{ 1139{
1145 if (THIS->envv) 1140 stringvec *vec = ix ? THIS->argv : THIS->envv;
1146 {
1147 AV *av = newAV ();
1148 1141
1142 EXTEND (SP, vec->size ());
1143
1149 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1144 for (char **i = vec->begin (); i != vec->end (); ++i)
1150 if (*i) 1145 if (*i)
1151 av_push (av, newSVpv (*i, 0)); 1146 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1152
1153 RETVAL = newRV_noinc ((SV *)av);
1154 }
1155 else
1156 RETVAL = &PL_sv_undef;
1157} 1147}
1158 OUTPUT:
1159 RETVAL
1160 1148
1161int 1149int
1162rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1150rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1163 CODE: 1151 CODE:
1164 RETVAL = THIS->pty_ev.events; 1152 RETVAL = THIS->pty_ev.events;
1165 if (events != EVENT_UNDEF) 1153 if (events != EVENT_UNDEF)
1166 THIS->pty_ev.set (events); 1154 THIS->pty_ev.set (events);
1167 OUTPUT: 1155 OUTPUT:
1168 RETVAL 1156 RETVAL
1169 1157
1170U32 1158int
1159rxvt_term::pty_fd ()
1160 CODE:
1161 RETVAL = THIS->pty->pty;
1162 OUTPUT:
1163 RETVAL
1164
1165Window
1171rxvt_term::parent () 1166rxvt_term::parent ()
1172 CODE: 1167 CODE:
1173 RETVAL = (U32)THIS->parent [0]; 1168 RETVAL = THIS->parent [0];
1174 OUTPUT: 1169 OUTPUT:
1175 RETVAL 1170 RETVAL
1176 1171
1177U32 1172Window
1178rxvt_term::vt () 1173rxvt_term::vt ()
1179 CODE: 1174 CODE:
1180 RETVAL = (U32)THIS->vt; 1175 RETVAL = THIS->vt;
1181 OUTPUT: 1176 OUTPUT:
1182 RETVAL 1177 RETVAL
1183 1178
1184void 1179void
1185rxvt_term::vt_emask_add (U32 emask) 1180rxvt_term::vt_emask_add (U32 emask)
1207} 1202}
1208 OUTPUT: 1203 OUTPUT:
1209 RETVAL 1204 RETVAL
1210 1205
1211void 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
1212rxvt_term::want_refresh () 1239rxvt_term::want_refresh ()
1213 CODE: 1240 CODE:
1214 THIS->want_refresh = 1; 1241 THIS->want_refresh = 1;
1215 1242
1216void 1243void
1222 1249
1223 line_t &l = ROW(row_number); 1250 line_t &l = ROW(row_number);
1224 1251
1225 if (GIMME_V != G_VOID) 1252 if (GIMME_V != G_VOID)
1226 { 1253 {
1227 wchar_t *wstr = new wchar_t [THIS->ncol]; 1254 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1228 1255
1229 for (int col = 0; col < THIS->ncol; col++) 1256 for (int col = 0; col < THIS->ncol; col++)
1230 wstr [col] = l.t [col]; 1257 wstr [col] = l.t [col];
1231 1258
1232 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 1259 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1233
1234 delete [] wstr;
1235 } 1260 }
1236 1261
1237 if (new_text) 1262 if (new_text)
1238 { 1263 {
1239 wchar_t *wstr = sv2wcs (new_text); 1264 wchar_t *wstr = sv2wcs (new_text);
1240 1265
1241 int len = min (wcslen (wstr) - start_ofs, max_len); 1266 int len = min (wcslen (wstr) - start_ofs, max_len);
1242 1267
1243 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1268 if (start_col < 0 || start_col + len > THIS->ncol)
1244 { 1269 {
1245 free (wstr); 1270 free (wstr);
1246 croak ("new_text extends beyond horizontal margins"); 1271 croak ("new_text extends beyond horizontal margins");
1247 } 1272 }
1248 1273
1280 { 1305 {
1281 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1306 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1282 croak ("new_rend must be arrayref"); 1307 croak ("new_rend must be arrayref");
1283 1308
1284 AV *av = (AV *)SvRV (new_rend); 1309 AV *av = (AV *)SvRV (new_rend);
1285 int len = min (av_len (av) + 1 - start_ofs, max_len); 1310 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1286 1311
1287 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1312 if (start_col < 0 || start_col + len > THIS->ncol)
1288 croak ("new_rend array extends beyond horizontal margins"); 1313 croak ("new_rend array extends beyond horizontal margins");
1289 1314
1290 for (int col = start_col; col < start_col + len; col++) 1315 for (int col = start_col; col < start_col + len; col++)
1291 { 1316 {
1292 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;
1332rxvt_term::special_encode (SV *string) 1357rxvt_term::special_encode (SV *string)
1333 CODE: 1358 CODE:
1334{ 1359{
1335 wchar_t *wstr = sv2wcs (string); 1360 wchar_t *wstr = sv2wcs (string);
1336 int wlen = wcslen (wstr); 1361 int wlen = wcslen (wstr);
1337 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1362 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1338 1363
1339 rxvt_push_locale (THIS->locale); 1364 rxvt_push_locale (THIS->locale);
1340 1365
1341 wchar_t *r = rstr; 1366 wchar_t *r = rstr;
1342 for (wchar_t *s = wstr; *s; s++) 1367 for (wchar_t *s = wstr; *s; s++)
1368 {
1369 int w = WCWIDTH (*s);
1370
1343 if (wcwidth (*s) == 0) 1371 if (w == 0)
1344 { 1372 {
1345 if (r == rstr) 1373 if (r == rstr)
1346 croak ("leading combining character unencodable"); 1374 croak ("leading combining character unencodable");
1347 1375
1348 unicode_t n = rxvt_compose (r[-1], *s); 1376 unicode_t n = rxvt_compose (r[-1], *s);
1349 if (n == NOCHAR) 1377 if (n == NOCHAR)
1350 n = rxvt_composite.compose (r[-1], *s); 1378 n = rxvt_composite.compose (r[-1], *s);
1351 1379
1352 r[-1] = n; 1380 r[-1] = n;
1353 } 1381 }
1354#if !UNICODE_3 1382#if !UNICODE_3
1355 else if (*s >= 0x10000) 1383 else if (*s >= 0x10000)
1356 *r++ = rxvt_composite.compose (*s); 1384 *r++ = rxvt_composite.compose (*s);
1357#endif 1385#endif
1358 else 1386 else
1359 *r++ = *s; 1387 *r++ = *s;
1388
1389 // the *2 above only allows wcwidth <= 2
1390 if (w > 1)
1391 *r++ = NOCHAR;
1392 }
1360 1393
1361 rxvt_pop_locale (); 1394 rxvt_pop_locale ();
1362 1395
1363 RETVAL = wcs2sv (rstr, r - rstr); 1396 RETVAL = wcs2sv (rstr, r - rstr);
1364
1365 delete [] rstr;
1366} 1397}
1367 OUTPUT: 1398 OUTPUT:
1368 RETVAL 1399 RETVAL
1369 1400
1370SV * 1401SV *
1382 else if (IS_COMPOSE (*s)) 1413 else if (IS_COMPOSE (*s))
1383 dlen += rxvt_composite.expand (*s, 0); 1414 dlen += rxvt_composite.expand (*s, 0);
1384 else 1415 else
1385 dlen++; 1416 dlen++;
1386 1417
1387 wchar_t *rstr = new wchar_t [dlen]; 1418 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1388 1419
1389 // decode 1420 // decode
1390 wchar_t *r = rstr; 1421 wchar_t *r = rstr;
1391 for (wchar_t *s = wstr; *s; s++) 1422 for (wchar_t *s = wstr; *s; s++)
1392 if (*s == NOCHAR) 1423 if (*s == NOCHAR)
1395 r += rxvt_composite.expand (*s, r); 1426 r += rxvt_composite.expand (*s, r);
1396 else 1427 else
1397 *r++ = *s; 1428 *r++ = *s;
1398 1429
1399 RETVAL = wcs2sv (rstr, r - rstr); 1430 RETVAL = wcs2sv (rstr, r - rstr);
1400
1401 delete [] rstr;
1402} 1431}
1403 OUTPUT: 1432 OUTPUT:
1404 RETVAL 1433 RETVAL
1405 1434
1406void 1435void
1407rxvt_term::_resource (char *name, int index, SV *newval = 0) 1436rxvt_term::_resource (char *name, int index, SV *newval = 0)
1408 PPCODE: 1437 PPCODE:
1409{ 1438{
1410 struct resval { const char *name; int value; } rslist [] = { 1439 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1411# define def(name) { # name, Rs_ ## name }, 1440# define def(name) { # name, Rs_ ## name },
1412# define reserve(name,count) 1441# define reserve(name,count)
1413# include "rsinc.h" 1442# include "rsinc.h"
1414# undef def 1443# undef def
1415# undef reserve 1444# undef reserve
1416 }; 1445 };
1417 1446
1418 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1447 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1419 1448
1420 do { 1449 do {
1421 if (rs-- == rslist) 1450 if (rs-- == rslist)
1422 croak ("no such resource '%s', requested", name); 1451 croak ("no such resource '%s', requested", name);
1423 } while (strcmp (name, rs->name)); 1452 } while (strcmp (name, rs->name));
1445 1474
1446const char * 1475const char *
1447rxvt_term::x_resource (const char *name) 1476rxvt_term::x_resource (const char *name)
1448 1477
1449bool 1478bool
1450rxvt_term::option (U32 optval, int set = -1) 1479rxvt_term::option (U8 optval, int set = -1)
1451 CODE: 1480 CODE:
1452{ 1481{
1453 RETVAL = THIS->options & optval; 1482 RETVAL = THIS->option (optval);
1454 1483
1455 if (set >= 0) 1484 if (set >= 0)
1456 { 1485 {
1457 if (set)
1458 THIS->options |= optval; 1486 THIS->set_option (optval, set);
1459 else
1460 THIS->options &= ~optval;
1461 1487
1488 if (THIS->check_ev.is_active ()) // avoid doing this before START
1462 switch (optval) 1489 switch (optval)
1463 { 1490 {
1464 case Opt_skipBuiltinGlyphs: 1491 case Opt_skipBuiltinGlyphs:
1465 THIS->set_fonts (); 1492 THIS->set_fonts ();
1466 THIS->scr_remap_chars (); 1493 THIS->scr_remap_chars ();
1467 THIS->scr_touch (true); 1494 THIS->scr_touch (true);
1468 THIS->want_refresh = 1; 1495 THIS->want_refresh = 1;
1469 break; 1496 break;
1470 1497
1471 case Opt_cursorUnderline: 1498 case Opt_cursorUnderline:
1472 THIS->want_refresh = 1; 1499 THIS->want_refresh = 1;
1473 break; 1500 break;
1474 1501
1475# case Opt_scrollBar_floating: 1502# case Opt_scrollBar_floating:
1476# case Opt_scrollBar_right: 1503# case Opt_scrollBar_right:
1477# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1504# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1478# break; 1505# break;
1479 } 1506 }
1480 } 1507 }
1481} 1508}
1482 OUTPUT: 1509 OUTPUT:
1483 RETVAL 1510 RETVAL
1484 1511
1515 if (items == 3) 1542 if (items == 3)
1516 { 1543 {
1517 rc.row = SvIV (ST (1)); 1544 rc.row = SvIV (ST (1));
1518 rc.col = SvIV (ST (2)); 1545 rc.col = SvIV (ST (2));
1519 1546
1520 if (ix == 2 && rc.col == 0) 1547 if (ix == 2)
1521 { 1548 {
1549 if (rc.col == 0)
1550 {
1551 // col == 0 means end of previous line
1522 rc.row--; 1552 rc.row--;
1523 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 }
1524 } 1561 }
1525 1562
1526 clamp_it (rc.col, 0, THIS->ncol); 1563 clamp_it (rc.col, 0, THIS->ncol);
1527 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1564 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1528 1565
1536 CODE: 1573 CODE:
1537 RETVAL = THIS->charsets [THIS->screen.charset]; 1574 RETVAL = THIS->charsets [THIS->screen.charset];
1538 OUTPUT: 1575 OUTPUT:
1539 RETVAL 1576 RETVAL
1540 1577
1541#void 1578void
1542#rxvt_term::selection_clear () 1579rxvt_term::selection_clear ()
1543 1580
1544void 1581void
1545rxvt_term::selection_make (U32 eventtime, bool rect = false) 1582rxvt_term::selection_make (Time eventtime, bool rect = false)
1546 CODE: 1583 CODE:
1547 THIS->selection.op = SELECTION_CONT; 1584 THIS->selection.op = SELECTION_CONT;
1548 THIS->selection.rect = rect; 1585 THIS->selection.rect = rect;
1549 THIS->selection_make (eventtime); 1586 THIS->selection_make (eventtime);
1550 1587
1551int 1588int
1552rxvt_term::selection_grab (U32 eventtime) 1589rxvt_term::selection_grab (Time eventtime)
1553 1590
1554void 1591void
1555rxvt_term::selection (SV *newtext = 0) 1592rxvt_term::selection (SV *newtext = 0)
1556 PPCODE: 1593 PPCODE:
1557{ 1594{
1575void 1612void
1576rxvt_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)
1577 1614
1578void 1615void
1579rxvt_term::scr_bell () 1616rxvt_term::scr_bell ()
1617
1618void
1619rxvt_term::scr_change_screen (int screen)
1580 1620
1581void 1621void
1582rxvt_term::scr_add_lines (SV *string) 1622rxvt_term::scr_add_lines (SV *string)
1583 CODE: 1623 CODE:
1584{ 1624{
1625 o->self = (HV *)SvRV (RETVAL); 1665 o->self = (HV *)SvRV (RETVAL);
1626} 1666}
1627 OUTPUT: 1667 OUTPUT:
1628 RETVAL 1668 RETVAL
1629 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
1630MODULE = urxvt PACKAGE = urxvt::overlay 1809MODULE = urxvt PACKAGE = urxvt::overlay
1631 1810
1632void 1811void
1633overlay::set (int x, int y, SV *text, SV *rend = 0) 1812overlay::set (int x, int y, SV *text, SV *rend = 0)
1634 1813
1639overlay::hide () 1818overlay::hide ()
1640 1819
1641void 1820void
1642overlay::DESTROY () 1821overlay::DESTROY ()
1643 1822
1644MODULE = urxvt PACKAGE = urxvt::timer 1823INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1645 1824
1646SV *
1647timer::new ()
1648 CODE:
1649 timer *w = new timer;
1650 w->start (NOW);
1651 RETVAL = newSVptr ((void *)w, "urxvt::timer");
1652 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:
1662 RETVAL
1663
1664NV
1665timer::at ()
1666 CODE:
1667 RETVAL = THIS->at;
1668 OUTPUT:
1669 RETVAL
1670
1671timer *
1672timer::interval (NV interval)
1673 CODE:
1674 THIS->interval = interval;
1675 RETVAL = THIS;
1676 OUTPUT:
1677 RETVAL
1678
1679timer *
1680timer::set (NV tstamp)
1681 CODE:
1682 THIS->set (tstamp);
1683 RETVAL = THIS;
1684 OUTPUT:
1685 RETVAL
1686
1687timer *
1688timer::start (NV tstamp = THIS->at)
1689 CODE:
1690 THIS->start (tstamp);
1691 RETVAL = THIS;
1692 OUTPUT:
1693 RETVAL
1694
1695timer *
1696timer::stop ()
1697 CODE:
1698 THIS->stop ();
1699 RETVAL = THIS;
1700 OUTPUT:
1701 RETVAL
1702
1703void
1704timer::DESTROY ()
1705
1706MODULE = urxvt PACKAGE = urxvt::iow
1707
1708SV *
1709iow::new ()
1710 CODE:
1711 iow *w = new iow;
1712 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1713 w->self = (HV *)SvRV (RETVAL);
1714 OUTPUT:
1715 RETVAL
1716
1717iow *
1718iow::cb (SV *cb)
1719 CODE:
1720 THIS->cb (cb);
1721 RETVAL = THIS;
1722 OUTPUT:
1723 RETVAL
1724
1725iow *
1726iow::fd (int fd)
1727 CODE:
1728 THIS->fd = fd;
1729 RETVAL = THIS;
1730 OUTPUT:
1731 RETVAL
1732
1733iow *
1734iow::events (short events)
1735 CODE:
1736 THIS->events = events;
1737 RETVAL = THIS;
1738 OUTPUT:
1739 RETVAL
1740
1741iow *
1742iow::start ()
1743 CODE:
1744 THIS->start ();
1745 RETVAL = THIS;
1746 OUTPUT:
1747 RETVAL
1748
1749iow *
1750iow::stop ()
1751 CODE:
1752 THIS->stop ();
1753 RETVAL = THIS;
1754 OUTPUT:
1755 RETVAL
1756
1757void
1758iow::DESTROY ()
1759
1760

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines