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.70 by root, Tue Jan 17 09:34:21 2006 UTC vs.
Revision 1.110 by root, Thu Dec 14 17:22:04 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines