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.69 by root, Mon Jan 16 15:00:20 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);
440 swap (perl_environ, environ); 358 swap (perl_environ, environ);
441 359
442 rxvt_pop_locale (); 360 rxvt_pop_locale ();
443 } 361 }
444 362
363 if (perl)
364 {
445 // runs outside of perls ENV 365 // runs outside of perls ENV
446 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 366 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
447 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);
368 }
448} 369}
449 370
450static void 371static void
451ungrab (rxvt_term *THIS) 372ungrab (rxvt_term *THIS)
452{ 373{
453 if (THIS->perl.grabtime) 374 if (THIS->perl.grabtime)
454 { 375 {
455 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime); 376 XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
456 XUngrabPointer (THIS->display->display, THIS->perl.grabtime); 377 XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
457 THIS->perl.grabtime = 0; 378 THIS->perl.grabtime = 0;
458 } 379 }
459} 380}
460 381
461static void
462swap_overlays (rxvt_term *term)
463{
464 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
465
466 if (HvKEYS (hv))
467 {
468 hv_iterinit (hv);
469
470 while (HE *he = hv_iternext (hv))
471 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
472 }
473}
474
475bool 382bool
476rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 383rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
477{ 384{
478 if (!perl || !term->perl.self) 385 if (!perl || !term->perl.self)
479 return false; 386 return false;
480 387
481 // pre-handling of some events 388 // pre-handling of some events
482 if (htype == HOOK_REFRESH_END) 389 if (htype == HOOK_REFRESH_END)
483 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 }
484 396
485 swap (perl_environ, environ); 397 swap (perl_environ, environ);
486 398
487 bool event_consumed; 399 bool event_consumed;
488 400
515 case DT_LONG: 427 case DT_LONG:
516 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 428 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
517 break; 429 break;
518 430
519 case DT_STR: 431 case DT_STR:
520 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0)))); 432 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
521 break; 433 break;
522 434
523 case DT_STR_LEN: 435 case DT_STR_LEN:
524 { 436 {
525 char *str = va_arg (ap, char *); 437 char *str = va_arg (ap, char *);
526 int len = va_arg (ap, int); 438 int len = va_arg (ap, int);
527 439
528 XPUSHs (taint (sv_2mortal (newSVpvn (str, len)))); 440 XPUSHs (sv_2mortal (newSVpvn (str, len)));
529 } 441 }
530 break; 442 break;
531 443
532 case DT_WCS_LEN: 444 case DT_WCS_LEN:
533 { 445 {
534 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 *);
535 int wlen = va_arg (ap, int); 456 int llen = va_arg (ap, int);
536 457
537 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen)))); 458 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
538 } 459 }
539 break; 460 break;
540 461
541 case DT_XEVENT: 462 case DT_XEVENT:
542 { 463 {
543 XEvent *xe = va_arg (ap, XEvent *); 464 XEvent *xe = va_arg (ap, XEvent *);
544 HV *hv = newHV (); 465 HV *hv = newHV ();
545 466
546# 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)
547# 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)
548# undef set 470# undef set
549 471
550 setiv (type, xe->type); 472 setiv (type, xe->type);
551 setiv (send_event, xe->xany.send_event); 473 setiv (send_event, xe->xany.send_event);
552 setiv (serial, xe->xany.serial); 474 setiv (serial, xe->xany.serial);
553 475
556 case KeyPress: 478 case KeyPress:
557 case KeyRelease: 479 case KeyRelease:
558 case ButtonPress: 480 case ButtonPress:
559 case ButtonRelease: 481 case ButtonRelease:
560 case MotionNotify: 482 case MotionNotify:
483 setuv (window, xe->xmotion.window);
484 setuv (root, xe->xmotion.root);
485 setuv (subwindow, xe->xmotion.subwindow);
561 setiv (time, xe->xmotion.time); 486 setuv (time, xe->xmotion.time);
562 setiv (x, xe->xmotion.x); 487 setiv (x, xe->xmotion.x);
563 setiv (y, xe->xmotion.y); 488 setiv (y, xe->xmotion.y);
564 setiv (row, xe->xmotion.y / term->fheight); 489 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
565 setiv (col, xe->xmotion.x / term->fwidth); 490 setiv (col, xe->xmotion.x / term->fwidth);
566 setiv (x_root, xe->xmotion.x_root); 491 setiv (x_root, xe->xmotion.x_root);
567 setiv (y_root, xe->xmotion.y_root); 492 setiv (y_root, xe->xmotion.y_root);
568 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
569 break; 512 break;
570 }
571 513
514 case MapNotify:
515 case UnmapNotify:
516 case ConfigureNotify:
517 setuv (event, xe->xconfigure.event);
518 setuv (window, xe->xconfigure.window);
519
572 switch (xe->type) 520 switch (xe->type)
573 { 521 {
574 case KeyPress: 522 case ConfigureNotify:
575 case KeyRelease: 523 setiv (x, xe->xconfigure.x);
576 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
577 break; 531 break;
578 532
579 case ButtonPress: 533 case PropertyNotify:
580 case ButtonRelease: 534 setuv (window, xe->xproperty.window);
581 setiv (button, xe->xbutton.button); 535 setuv (atom, xe->xproperty.atom);
536 setuv (time, xe->xproperty.time);
537 setiv (state, xe->xproperty.state);
582 break; 538 break;
583 539
584 case MotionNotify: 540 case ClientMessage:
585 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]);
586 break; 549 break;
587 } 550 }
588 551
589 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 552 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
590 } 553 }
631 else 594 else
632 event_consumed = false; 595 event_consumed = false;
633 596
634 // post-handling of some events 597 // post-handling of some events
635 if (htype == HOOK_REFRESH_BEGIN) 598 if (htype == HOOK_REFRESH_BEGIN)
636 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 }
637 else if (htype == HOOK_DESTROY) 605 else if (htype == HOOK_DESTROY)
638 { 606 {
639 clearSVptr ((SV *)term->perl.self); 607 clearSVptr ((SV *)term->perl.self);
640 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;
641 } 612 }
642 613
643 swap (perl_environ, environ); 614 swap (perl_environ, environ);
644 615
645 return event_consumed; 616 return event_consumed;
669# include "optinc.h" 640# include "optinc.h"
670# undef nodef 641# undef nodef
671# undef def 642# undef def
672 643
673 HV *stash = gv_stashpv ("urxvt", 1); 644 HV *stash = gv_stashpv ("urxvt", 1);
674 struct { 645 static const struct {
675 const char *name; 646 const char *name;
676 IV iv; 647 IV iv;
677 } *civ, const_iv[] = { 648 } *civ, const_iv[] = {
678# define const_iv(name) { # name, (IV)name } 649# define const_iv(name) { # name, (IV)name }
679 const_iv (DEFAULT_RSTYLE), 650 const_iv (DEFAULT_RSTYLE),
698 const_iv (Button3Mask), 669 const_iv (Button3Mask),
699 const_iv (Button4Mask), 670 const_iv (Button4Mask),
700 const_iv (Button5Mask), 671 const_iv (Button5Mask),
701 const_iv (AnyModifier), 672 const_iv (AnyModifier),
702 673
703 const_iv (EVENT_NONE), 674 const_iv (NoSymbol),
704 const_iv (EVENT_READ), 675 const_iv (GrabModeSync),
705 const_iv (EVENT_WRITE), 676 const_iv (GrabModeAsync),
706 677
707 const_iv (NoEventMask), 678 const_iv (NoEventMask),
708 const_iv (KeyPressMask), 679 const_iv (KeyPressMask),
709 const_iv (KeyReleaseMask), 680 const_iv (KeyReleaseMask),
710 const_iv (ButtonPressMask), 681 const_iv (ButtonPressMask),
762 const_iv (SelectionRequest), 733 const_iv (SelectionRequest),
763 const_iv (SelectionNotify), 734 const_iv (SelectionNotify),
764 const_iv (ColormapNotify), 735 const_iv (ColormapNotify),
765 const_iv (ClientMessage), 736 const_iv (ClientMessage),
766 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
767 }; 763 };
768 764
769 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; )
770 civ-- > const_iv; )
771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 766 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
772} 767}
773 768
774void 769void
775warn (const char *msg) 770warn (const char *msg)
779void 774void
780fatal (const char *msg) 775fatal (const char *msg)
781 CODE: 776 CODE:
782 rxvt_fatal ("%s", msg); 777 rxvt_fatal ("%s", msg);
783 778
784SV *
785untaint (SV *sv)
786 CODE:
787 RETVAL = newSVsv (sv);
788 SvTAINTED_off (RETVAL);
789 OUTPUT:
790 RETVAL
791
792void 779void
793_exit (int status) 780_exit (int status)
794
795bool
796safe ()
797 CODE:
798 RETVAL = !rxvt_tainted ();
799 OUTPUT:
800 RETVAL
801 781
802NV 782NV
803NOW () 783NOW ()
804 CODE: 784 CODE:
805 RETVAL = NOW; 785 RETVAL = NOW;
821 RETVAL 801 RETVAL
822 802
823int 803int
824SET_FGCOLOR (int rend, int new_color) 804SET_FGCOLOR (int rend, int new_color)
825 CODE: 805 CODE:
826 RETVAL = SET_FGCOLOR (rend, new_color); 806 RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
827 OUTPUT: 807 OUTPUT:
828 RETVAL 808 RETVAL
829 809
830int 810int
831SET_BGCOLOR (int rend, int new_color) 811SET_BGCOLOR (int rend, int new_color)
832 CODE: 812 CODE:
833 RETVAL = SET_BGCOLOR (rend, new_color); 813 RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
834 OUTPUT: 814 OUTPUT:
835 RETVAL 815 RETVAL
836 816
837int 817int
838GET_CUSTOM (int rend) 818GET_CUSTOM (int rend)
839 CODE: 819 CODE:
840 RETVAL = (rend && RS_customMask) >> RS_customShift; 820 RETVAL = (rend & RS_customMask) >> RS_customShift;
841 OUTPUT: 821 OUTPUT:
842 RETVAL 822 RETVAL
843 823
844int 824int
845SET_CUSTOM (int rend, int new_value) 825SET_CUSTOM (int rend, int new_value)
852 | ((new_value << RS_customShift) & RS_customMask); 832 | ((new_value << RS_customShift) & RS_customMask);
853} 833}
854 OUTPUT: 834 OUTPUT:
855 RETVAL 835 RETVAL
856 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
857MODULE = urxvt PACKAGE = urxvt::term 848MODULE = urxvt PACKAGE = urxvt::term
858 849
859SV * 850SV *
860_new (...) 851_new (AV *env, AV *arg)
861 CODE: 852 CODE:
862{ 853{
863 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
864 croak ("first argument to urxvt::term->_new must be arrayref");
865
866 rxvt_term *term = new rxvt_term; 854 rxvt_term *term = new rxvt_term;
867 855
868 term->argv = new stringvec; 856 stringvec *argv = new stringvec;
869 term->envv = new stringvec; 857 stringvec *envv = new stringvec;
870 858
871 for (int i = 1; i < items; i++) 859 for (int i = 0; i <= AvFILL (arg); i++)
872 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i)))); 860 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
873 861
874 AV *envv = (AV *)SvRV (ST (0));
875 for (int i = av_len (envv) + 1; i--; ) 862 for (int i = AvFILL (env) + 1; i--; )
876 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1)))); 863 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
877 864
878 term->envv->push_back (0); 865 envv->push_back (0);
879 866
880 bool success; 867 bool success;
881 868
882 try 869 try
883 { 870 {
884 success = term->init (term->argv->size (), term->argv->begin ()); 871 success = term->init (argv, envv);
885 } 872 }
886 catch (const class rxvt_failure_exception &e) 873 catch (const class rxvt_failure_exception &e)
887 { 874 {
888 success = false; 875 success = false;
889 } 876 }
901 RETVAL 888 RETVAL
902 889
903void 890void
904rxvt_term::destroy () 891rxvt_term::destroy ()
905 892
906#if ENABLE_PERL_FRILLS
907
908void
909rxvt_term::XListProperties (U32 window)
910 PPCODE:
911{
912 int count;
913 Atom *props = XListProperties (THIS->display->display, (Window)window, &count);
914
915 EXTEND (SP, count);
916 while (count--)
917 PUSHs (newSVuv ((U32)props [count]));
918
919 XFree (props);
920}
921
922void
923rxvt_term::XGetWindowProperty (U32 window, U32 property)
924 PPCODE:
925{
926 Atom type;
927 int format;
928 unsigned long nitems;
929 unsigned long bytes_after;
930 unsigned char *prop;
931 XGetWindowProperty (THIS->display->display, (Window)window, (Atom)property,
932 0, 1<<30, 0, AnyPropertyType,
933 &type, &format, &nitems, &bytes_after, &prop);
934 if (type != None)
935 {
936 EXTEND (SP, 3);
937 PUSHs (newSVuv ((U32)type));
938 PUSHs (newSViv (format));
939 PUSHs (newSVpvn ((char *)prop, nitems * format / 8));
940 XFree (prop);
941 }
942}
943
944void
945rxvt_term::XChangeWindowProperty (U32 window, U32 property, U32 type, int format, SV *data)
946 CODE:
947{
948 STRLEN len;
949 char *data_ = SvPVbyte (data, len);
950
951 XChangeProperty (THIS->display->display, (Window)window, (Atom)property,
952 type, format, PropModeReplace,
953 (unsigned char *)data, len * 8 / format);
954}
955
956void
957rxvt_term::XDeleteProperty (U32 window, U32 property)
958 CODE:
959 XDeleteProperty (THIS->display->display, (Window)window, (Atom)property);
960
961U32
962rxvt_term::DefaultRootWindow ()
963 CODE:
964 RETVAL = (U32)THIS->display->root;
965 OUTPUT:
966 RETVAL
967
968U32
969rxvt_term::XCreateSimpleWindow (U32 parent, int x, int y, unsigned int width, unsigned int height)
970 CODE:
971 RETVAL = XCreateSimpleWindow (THIS->display->display, (Window)parent,
972 x, y, width, height, 0,
973 THIS->pix_colors_focused[Color_border],
974 THIS->pix_colors_focused[Color_border]);
975 OUTPUT:
976 RETVAL
977
978void
979rxvt_term::XReparentWindow (U32 window, U32 parent, int x = 0, int y = 0)
980 CODE:
981 XReparentWindow (THIS->display->display, (Window)window, (Window)parent, x, y);
982
983void
984rxvt_term::XMapWindow (U32 window)
985 CODE:
986 XMapWindow (THIS->display->display, (Window)window);
987
988void
989rxvt_term::XUnmapWindow (U32 window)
990 CODE:
991 XUnmapWindow (THIS->display->display, (Window)window);
992
993#endif
994
995void 893void
996rxvt_term::set_should_invoke (int htype, int inc) 894rxvt_term::set_should_invoke (int htype, int inc)
997 CODE: 895 CODE:
998 THIS->perl.should_invoke [htype] += inc; 896 THIS->perl.should_invoke [htype] += inc;
999 897
1000void 898int
1001rxvt_term::grab_button (int button, U32 modifiers) 899rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
1002 CODE: 900 CODE:
1003 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 901 RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
1004 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 902 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1005 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);
1006 927
1007bool 928bool
1008rxvt_term::grab (U32 eventtime, int sync = 0) 929rxvt_term::grab (Time eventtime, int sync = 0)
1009 CODE: 930 CODE:
1010{ 931{
1011 int mode = sync ? GrabModeSync : GrabModeAsync; 932 int mode = sync ? GrabModeSync : GrabModeAsync;
1012 933
1013 THIS->perl.grabtime = 0; 934 THIS->perl.grabtime = 0;
1014 935
1015 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 936 if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
1016 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 937 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
1017 mode, mode, None, GRAB_CURSOR, eventtime)) 938 mode, mode, None, GRAB_CURSOR, eventtime))
1018 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 939 if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
1019 THIS->perl.grabtime = eventtime; 940 THIS->perl.grabtime = eventtime;
1020 else 941 else
1021 XUngrabPointer (THIS->display->display, eventtime); 942 XUngrabPointer (THIS->dpy, eventtime);
1022 943
1023 RETVAL = !!THIS->perl.grabtime; 944 RETVAL = !!THIS->perl.grabtime;
1024} 945}
1025 OUTPUT: 946 OUTPUT:
1026 RETVAL 947 RETVAL
1027 948
1028void 949void
1029rxvt_term::allow_events_async () 950rxvt_term::allow_events_async ()
1030 CODE: 951 CODE:
1031 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime); 952 XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
1032 953
1033void 954void
1034rxvt_term::allow_events_sync () 955rxvt_term::allow_events_sync ()
1035 CODE: 956 CODE:
1036 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime); 957 XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
1037 958
1038void 959void
1039rxvt_term::allow_events_replay () 960rxvt_term::allow_events_replay ()
1040 CODE: 961 CODE:
1041 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime); 962 XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
1042 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime); 963 XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
1043 964
1044void 965void
1045rxvt_term::ungrab () 966rxvt_term::ungrab ()
1046 CODE: 967 CODE:
1047 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
1048 993
1049int 994int
1050rxvt_term::strwidth (SV *str) 995rxvt_term::strwidth (SV *str)
1051 CODE: 996 CODE:
1052{ 997{
1053 wchar_t *wstr = sv2wcs (str); 998 wchar_t *wstr = sv2wcs (str);
1054 999
1055 rxvt_push_locale (THIS->locale); 1000 rxvt_push_locale (THIS->locale);
1056 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 }
1057 rxvt_pop_locale (); 1009 rxvt_pop_locale ();
1058 1010
1059 free (wstr); 1011 free (wstr);
1060} 1012}
1061 OUTPUT: 1013 OUTPUT:
1071 char *mbstr = rxvt_wcstombs (wstr); 1023 char *mbstr = rxvt_wcstombs (wstr);
1072 rxvt_pop_locale (); 1024 rxvt_pop_locale ();
1073 1025
1074 free (wstr); 1026 free (wstr);
1075 1027
1076 RETVAL = taint_if (newSVpv (mbstr, 0), str); 1028 RETVAL = newSVpv (mbstr, 0);
1077 free (mbstr); 1029 free (mbstr);
1078} 1030}
1079 OUTPUT: 1031 OUTPUT:
1080 RETVAL 1032 RETVAL
1081 1033
1088 1040
1089 rxvt_push_locale (THIS->locale); 1041 rxvt_push_locale (THIS->locale);
1090 wchar_t *wstr = rxvt_mbstowcs (data, len); 1042 wchar_t *wstr = rxvt_mbstowcs (data, len);
1091 rxvt_pop_locale (); 1043 rxvt_pop_locale ();
1092 1044
1093 RETVAL = taint_if (wcs2sv (wstr), octets); 1045 RETVAL = wcs2sv (wstr);
1094 free (wstr); 1046 free (wstr);
1095} 1047}
1048 OUTPUT:
1049 RETVAL
1050
1051char *
1052rxvt_term::locale ()
1053 CODE:
1054 RETVAL = THIS->locale;
1096 OUTPUT: 1055 OUTPUT:
1097 RETVAL 1056 RETVAL
1098 1057
1099#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1100 1059
1105#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1106#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1107#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1108#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1109#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)
1110#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1072#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1111#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1073#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1112#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1074#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1113 1075
1114int 1076int
1121 fbase = TERM_OFFSET_fbase 1083 fbase = TERM_OFFSET_fbase
1122 nrow = TERM_OFFSET_nrow 1084 nrow = TERM_OFFSET_nrow
1123 ncol = TERM_OFFSET_ncol 1085 ncol = TERM_OFFSET_ncol
1124 focus = TERM_OFFSET_focus 1086 focus = TERM_OFFSET_focus
1125 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
1126 saveLines = TERM_OFFSET_saveLines 1091 saveLines = TERM_OFFSET_saveLines
1127 total_rows = TERM_OFFSET_total_rows 1092 total_rows = TERM_OFFSET_total_rows
1128 top_row = TERM_OFFSET_top_row 1093 top_row = TERM_OFFSET_top_row
1129 CODE: 1094 CODE:
1130 RETVAL = *(int *)((char *)THIS + ix); 1095 RETVAL = *(int *)((char *)THIS + ix);
1135rxvt_term::ModLevel3Mask () 1100rxvt_term::ModLevel3Mask ()
1136 ALIAS: 1101 ALIAS:
1137 ModLevel3Mask = 0 1102 ModLevel3Mask = 0
1138 ModMetaMask = 1 1103 ModMetaMask = 1
1139 ModNumLockMask = 2 1104 ModNumLockMask = 2
1105 current_screen = 3
1106 hidden_cursor = 4
1140 CODE: 1107 CODE:
1141 switch (ix) 1108 switch (ix)
1142 { 1109 {
1143 case 0: RETVAL = THIS->ModLevel3Mask; break; 1110 case 0: RETVAL = THIS->ModLevel3Mask; break;
1144 case 1: RETVAL = THIS->ModMetaMask; break; 1111 case 1: RETVAL = THIS->ModMetaMask; break;
1145 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;
1146 } 1115 }
1147 OUTPUT: 1116 OUTPUT:
1148 RETVAL 1117 RETVAL
1149 1118
1150char * 1119char *
1160 } 1129 }
1161 OUTPUT: 1130 OUTPUT:
1162 RETVAL 1131 RETVAL
1163 1132
1164SV * 1133SV *
1165rxvt_term::_env () 1134rxvt_term::envv ()
1135 ALIAS:
1136 argv = 1
1166 CODE: 1137 PPCODE:
1167{ 1138{
1168 if (THIS->envv) 1139 stringvec *vec = ix ? THIS->argv : THIS->envv;
1169 {
1170 AV *av = newAV ();
1171 1140
1141 EXTEND (SP, vec->size ());
1142
1172 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i) 1143 for (char **i = vec->begin (); i != vec->end (); ++i)
1173 if (*i) 1144 if (*i)
1174 av_push (av, newSVpv (*i, 0)); 1145 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1175
1176 RETVAL = newRV_noinc ((SV *)av);
1177 }
1178 else
1179 RETVAL = &PL_sv_undef;
1180} 1146}
1181 OUTPUT:
1182 RETVAL
1183 1147
1184int 1148int
1185rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1149rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1186 CODE: 1150 CODE:
1187 RETVAL = THIS->pty_ev.events; 1151 RETVAL = THIS->pty_ev.events;
1188 if (events != EVENT_UNDEF) 1152 if (events != EVENT_UNDEF)
1189 THIS->pty_ev.set (events); 1153 THIS->pty_ev.set (events);
1190 OUTPUT: 1154 OUTPUT:
1191 RETVAL 1155 RETVAL
1192 1156
1193U32 1157int
1158rxvt_term::pty_fd ()
1159 CODE:
1160 RETVAL = THIS->pty->pty;
1161 OUTPUT:
1162 RETVAL
1163
1164Window
1194rxvt_term::parent () 1165rxvt_term::parent ()
1195 CODE: 1166 CODE:
1196 RETVAL = (U32)THIS->parent [0]; 1167 RETVAL = THIS->parent [0];
1197 OUTPUT: 1168 OUTPUT:
1198 RETVAL 1169 RETVAL
1199 1170
1200U32 1171Window
1201rxvt_term::vt () 1172rxvt_term::vt ()
1202 CODE: 1173 CODE:
1203 RETVAL = (U32)THIS->vt; 1174 RETVAL = THIS->vt;
1204 OUTPUT: 1175 OUTPUT:
1205 RETVAL 1176 RETVAL
1206 1177
1207void 1178void
1208rxvt_term::vt_emask_add (U32 emask) 1179rxvt_term::vt_emask_add (U32 emask)
1230} 1201}
1231 OUTPUT: 1202 OUTPUT:
1232 RETVAL 1203 RETVAL
1233 1204
1234void 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
1235rxvt_term::want_refresh () 1238rxvt_term::want_refresh ()
1236 CODE: 1239 CODE:
1237 THIS->want_refresh = 1; 1240 THIS->want_refresh = 1;
1238 1241
1239void 1242void
1245 1248
1246 line_t &l = ROW(row_number); 1249 line_t &l = ROW(row_number);
1247 1250
1248 if (GIMME_V != G_VOID) 1251 if (GIMME_V != G_VOID)
1249 { 1252 {
1250 wchar_t *wstr = new wchar_t [THIS->ncol]; 1253 wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
1251 1254
1252 for (int col = 0; col < THIS->ncol; col++) 1255 for (int col = 0; col < THIS->ncol; col++)
1253 wstr [col] = l.t [col]; 1256 wstr [col] = l.t [col];
1254 1257
1255 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol)))); 1258 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
1256
1257 delete [] wstr;
1258 } 1259 }
1259 1260
1260 if (new_text) 1261 if (new_text)
1261 { 1262 {
1262 wchar_t *wstr = sv2wcs (new_text); 1263 wchar_t *wstr = sv2wcs (new_text);
1263 1264
1264 int len = min (wcslen (wstr) - start_ofs, max_len); 1265 int len = min (wcslen (wstr) - start_ofs, max_len);
1265 1266
1266 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1267 if (start_col < 0 || start_col + len > THIS->ncol)
1267 { 1268 {
1268 free (wstr); 1269 free (wstr);
1269 croak ("new_text extends beyond horizontal margins"); 1270 croak ("new_text extends beyond horizontal margins");
1270 } 1271 }
1271 1272
1303 { 1304 {
1304 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1305 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
1305 croak ("new_rend must be arrayref"); 1306 croak ("new_rend must be arrayref");
1306 1307
1307 AV *av = (AV *)SvRV (new_rend); 1308 AV *av = (AV *)SvRV (new_rend);
1308 int len = min (av_len (av) + 1 - start_ofs, max_len); 1309 int len = min (AvFILL (av) + 1 - start_ofs, max_len);
1309 1310
1310 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1311 if (start_col < 0 || start_col + len > THIS->ncol)
1311 croak ("new_rend array extends beyond horizontal margins"); 1312 croak ("new_rend array extends beyond horizontal margins");
1312 1313
1313 for (int col = start_col; col < start_col + len; col++) 1314 for (int col = start_col; col < start_col + len; col++)
1314 { 1315 {
1315 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;
1355rxvt_term::special_encode (SV *string) 1356rxvt_term::special_encode (SV *string)
1356 CODE: 1357 CODE:
1357{ 1358{
1358 wchar_t *wstr = sv2wcs (string); 1359 wchar_t *wstr = sv2wcs (string);
1359 int wlen = wcslen (wstr); 1360 int wlen = wcslen (wstr);
1360 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer 1361 wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
1361 1362
1362 rxvt_push_locale (THIS->locale); 1363 rxvt_push_locale (THIS->locale);
1363 1364
1364 wchar_t *r = rstr; 1365 wchar_t *r = rstr;
1365 for (wchar_t *s = wstr; *s; s++) 1366 for (wchar_t *s = wstr; *s; s++)
1367 {
1368 int w = WCWIDTH (*s);
1369
1366 if (wcwidth (*s) == 0) 1370 if (w == 0)
1367 { 1371 {
1368 if (r == rstr) 1372 if (r == rstr)
1369 croak ("leading combining character unencodable"); 1373 croak ("leading combining character unencodable");
1370 1374
1371 unicode_t n = rxvt_compose (r[-1], *s); 1375 unicode_t n = rxvt_compose (r[-1], *s);
1372 if (n == NOCHAR) 1376 if (n == NOCHAR)
1373 n = rxvt_composite.compose (r[-1], *s); 1377 n = rxvt_composite.compose (r[-1], *s);
1374 1378
1375 r[-1] = n; 1379 r[-1] = n;
1376 } 1380 }
1377#if !UNICODE_3 1381#if !UNICODE_3
1378 else if (*s >= 0x10000) 1382 else if (*s >= 0x10000)
1379 *r++ = rxvt_composite.compose (*s); 1383 *r++ = rxvt_composite.compose (*s);
1380#endif 1384#endif
1381 else 1385 else
1382 *r++ = *s; 1386 *r++ = *s;
1387
1388 // the *2 above only allows wcwidth <= 2
1389 if (w > 1)
1390 *r++ = NOCHAR;
1391 }
1383 1392
1384 rxvt_pop_locale (); 1393 rxvt_pop_locale ();
1385 1394
1386 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string); 1395 RETVAL = wcs2sv (rstr, r - rstr);
1387
1388 delete [] rstr;
1389} 1396}
1390 OUTPUT: 1397 OUTPUT:
1391 RETVAL 1398 RETVAL
1392 1399
1393SV * 1400SV *
1405 else if (IS_COMPOSE (*s)) 1412 else if (IS_COMPOSE (*s))
1406 dlen += rxvt_composite.expand (*s, 0); 1413 dlen += rxvt_composite.expand (*s, 0);
1407 else 1414 else
1408 dlen++; 1415 dlen++;
1409 1416
1410 wchar_t *rstr = new wchar_t [dlen]; 1417 wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
1411 1418
1412 // decode 1419 // decode
1413 wchar_t *r = rstr; 1420 wchar_t *r = rstr;
1414 for (wchar_t *s = wstr; *s; s++) 1421 for (wchar_t *s = wstr; *s; s++)
1415 if (*s == NOCHAR) 1422 if (*s == NOCHAR)
1417 else if (IS_COMPOSE (*s)) 1424 else if (IS_COMPOSE (*s))
1418 r += rxvt_composite.expand (*s, r); 1425 r += rxvt_composite.expand (*s, r);
1419 else 1426 else
1420 *r++ = *s; 1427 *r++ = *s;
1421 1428
1422 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text); 1429 RETVAL = wcs2sv (rstr, r - rstr);
1423
1424 delete [] rstr;
1425} 1430}
1426 OUTPUT: 1431 OUTPUT:
1427 RETVAL 1432 RETVAL
1428 1433
1429void 1434void
1430rxvt_term::_resource (char *name, int index, SV *newval = 0) 1435rxvt_term::_resource (char *name, int index, SV *newval = 0)
1431 PPCODE: 1436 PPCODE:
1432{ 1437{
1433 struct resval { const char *name; int value; } rslist [] = { 1438 static const struct resval { const char *name; int value; } *rs, rslist [] = {
1434# define def(name) { # name, Rs_ ## name }, 1439# define def(name) { # name, Rs_ ## name },
1435# define reserve(name,count) 1440# define reserve(name,count)
1436# include "rsinc.h" 1441# include "rsinc.h"
1437# undef def 1442# undef def
1438# undef reserve 1443# undef reserve
1439 }; 1444 };
1440 1445
1441 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1446 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1442 1447
1443 do { 1448 do {
1444 if (rs-- == rslist) 1449 if (rs-- == rslist)
1445 croak ("no such resource '%s', requested", name); 1450 croak ("no such resource '%s', requested", name);
1446 } while (strcmp (name, rs->name)); 1451 } while (strcmp (name, rs->name));
1449 1454
1450 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1455 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1451 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);
1452 1457
1453 if (GIMME_V != G_VOID) 1458 if (GIMME_V != G_VOID)
1454 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);
1455 1460
1456 if (newval) 1461 if (newval)
1457 { 1462 {
1458 if (SvOK (newval)) 1463 if (SvOK (newval))
1459 { 1464 {
1466 } 1471 }
1467} 1472}
1468 1473
1469const char * 1474const char *
1470rxvt_term::x_resource (const char *name) 1475rxvt_term::x_resource (const char *name)
1471 CLEANUP:
1472 SvTAINTED_on (ST (0));
1473 1476
1474bool 1477bool
1475rxvt_term::option (U32 optval, int set = -1) 1478rxvt_term::option (U32 optval, int set = -1)
1476 CODE: 1479 CODE:
1477{ 1480{
1482 if (set) 1485 if (set)
1483 THIS->options |= optval; 1486 THIS->options |= optval;
1484 else 1487 else
1485 THIS->options &= ~optval; 1488 THIS->options &= ~optval;
1486 1489
1490 if (THIS->check_ev.is_active ()) // avoid doing this before START
1487 switch (optval) 1491 switch (optval)
1488 { 1492 {
1489 case Opt_skipBuiltinGlyphs: 1493 case Opt_skipBuiltinGlyphs:
1490 THIS->set_fonts (); 1494 THIS->set_fonts ();
1491 THIS->scr_remap_chars (); 1495 THIS->scr_remap_chars ();
1492 THIS->scr_touch (true); 1496 THIS->scr_touch (true);
1493 THIS->want_refresh = 1; 1497 THIS->want_refresh = 1;
1494 break; 1498 break;
1495 1499
1496 case Opt_cursorUnderline: 1500 case Opt_cursorUnderline:
1497 THIS->want_refresh = 1; 1501 THIS->want_refresh = 1;
1498 break; 1502 break;
1499 1503
1500# case Opt_scrollBar_floating: 1504# case Opt_scrollBar_floating:
1501# case Opt_scrollBar_right: 1505# case Opt_scrollBar_right:
1502# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1506# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1503# break; 1507# break;
1504 } 1508 }
1505 } 1509 }
1506} 1510}
1507 OUTPUT: 1511 OUTPUT:
1508 RETVAL 1512 RETVAL
1509 1513
1537 PUSHs (sv_2mortal (newSViv (rc.col))); 1541 PUSHs (sv_2mortal (newSViv (rc.col)));
1538 } 1542 }
1539 1543
1540 if (items == 3) 1544 if (items == 3)
1541 { 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);
1542 rc.row = clamp (SvIV (ST (1)), THIS->top_row, THIS->nrow - 1); 1566 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1543 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
1544 1567
1545 if (ix) 1568 if (ix)
1546 THIS->want_refresh = 1; 1569 THIS->want_refresh = 1;
1547 } 1570 }
1548} 1571}
1552 CODE: 1575 CODE:
1553 RETVAL = THIS->charsets [THIS->screen.charset]; 1576 RETVAL = THIS->charsets [THIS->screen.charset];
1554 OUTPUT: 1577 OUTPUT:
1555 RETVAL 1578 RETVAL
1556 1579
1557#void 1580void
1558#rxvt_term::selection_clear () 1581rxvt_term::selection_clear ()
1559 1582
1560void 1583void
1561rxvt_term::selection_make (U32 eventtime, bool rect = false) 1584rxvt_term::selection_make (Time eventtime, bool rect = false)
1562 CODE: 1585 CODE:
1563 THIS->selection.op = SELECTION_CONT; 1586 THIS->selection.op = SELECTION_CONT;
1564 THIS->selection.rect = rect; 1587 THIS->selection.rect = rect;
1565 THIS->selection_make (eventtime); 1588 THIS->selection_make (eventtime);
1566 1589
1567int 1590int
1568rxvt_term::selection_grab (U32 eventtime) 1591rxvt_term::selection_grab (Time eventtime)
1569 1592
1570void 1593void
1571rxvt_term::selection (SV *newtext = 0) 1594rxvt_term::selection (SV *newtext = 0)
1572 PPCODE: 1595 PPCODE:
1573{ 1596{
1574 if (GIMME_V != G_VOID) 1597 if (GIMME_V != G_VOID)
1575 XPUSHs (THIS->selection.text 1598 XPUSHs (THIS->selection.text
1576 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))) 1599 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
1577 : &PL_sv_undef); 1600 : &PL_sv_undef);
1578 1601
1579 if (newtext) 1602 if (newtext)
1580 { 1603 {
1581 free (THIS->selection.text); 1604 free (THIS->selection.text);
1591void 1614void
1592rxvt_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)
1593 1616
1594void 1617void
1595rxvt_term::scr_bell () 1618rxvt_term::scr_bell ()
1619
1620void
1621rxvt_term::scr_change_screen (int screen)
1596 1622
1597void 1623void
1598rxvt_term::scr_add_lines (SV *string) 1624rxvt_term::scr_add_lines (SV *string)
1599 CODE: 1625 CODE:
1600{ 1626{
1641 o->self = (HV *)SvRV (RETVAL); 1667 o->self = (HV *)SvRV (RETVAL);
1642} 1668}
1643 OUTPUT: 1669 OUTPUT:
1644 RETVAL 1670 RETVAL
1645 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
1646MODULE = urxvt PACKAGE = urxvt::overlay 1811MODULE = urxvt PACKAGE = urxvt::overlay
1647 1812
1648void 1813void
1649overlay::set (int x, int y, SV *text, SV *rend = 0) 1814overlay::set (int x, int y, SV *text, SV *rend = 0)
1650 1815
1655overlay::hide () 1820overlay::hide ()
1656 1821
1657void 1822void
1658overlay::DESTROY () 1823overlay::DESTROY ()
1659 1824
1660MODULE = urxvt PACKAGE = urxvt::timer 1825INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1661 1826
1662SV *
1663timer::new ()
1664 CODE:
1665 timer *w = new timer;
1666 w->start (NOW);
1667 RETVAL = newSVptr ((void *)w, "urxvt::timer");
1668 w->self = (HV *)SvRV (RETVAL);
1669 OUTPUT:
1670 RETVAL
1671
1672timer *
1673timer::cb (SV *cb)
1674 CODE:
1675 THIS->cb (cb);
1676 RETVAL = THIS;
1677 OUTPUT:
1678 RETVAL
1679
1680NV
1681timer::at ()
1682 CODE:
1683 RETVAL = THIS->at;
1684 OUTPUT:
1685 RETVAL
1686
1687timer *
1688timer::interval (NV interval)
1689 CODE:
1690 THIS->interval = interval;
1691 RETVAL = THIS;
1692 OUTPUT:
1693 RETVAL
1694
1695timer *
1696timer::set (NV tstamp)
1697 CODE:
1698 THIS->set (tstamp);
1699 RETVAL = THIS;
1700 OUTPUT:
1701 RETVAL
1702
1703timer *
1704timer::start (NV tstamp = THIS->at)
1705 CODE:
1706 THIS->start (tstamp);
1707 RETVAL = THIS;
1708 OUTPUT:
1709 RETVAL
1710
1711timer *
1712timer::stop ()
1713 CODE:
1714 THIS->stop ();
1715 RETVAL = THIS;
1716 OUTPUT:
1717 RETVAL
1718
1719void
1720timer::DESTROY ()
1721
1722MODULE = urxvt PACKAGE = urxvt::iow
1723
1724SV *
1725iow::new ()
1726 CODE:
1727 iow *w = new iow;
1728 RETVAL = newSVptr ((void *)w, "urxvt::iow");
1729 w->self = (HV *)SvRV (RETVAL);
1730 OUTPUT:
1731 RETVAL
1732
1733iow *
1734iow::cb (SV *cb)
1735 CODE:
1736 THIS->cb (cb);
1737 RETVAL = THIS;
1738 OUTPUT:
1739 RETVAL
1740
1741iow *
1742iow::fd (int fd)
1743 CODE:
1744 THIS->fd = fd;
1745 RETVAL = THIS;
1746 OUTPUT:
1747 RETVAL
1748
1749iow *
1750iow::events (short events)
1751 CODE:
1752 THIS->events = events;
1753 RETVAL = THIS;
1754 OUTPUT:
1755 RETVAL
1756
1757iow *
1758iow::start ()
1759 CODE:
1760 THIS->start ();
1761 RETVAL = THIS;
1762 OUTPUT:
1763 RETVAL
1764
1765iow *
1766iow::stop ()
1767 CODE:
1768 THIS->stop ();
1769 RETVAL = THIS;
1770 OUTPUT:
1771 RETVAL
1772
1773void
1774iow::DESTROY ()
1775
1776

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines