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