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.111 by root, Thu Dec 14 17:33:53 2006 UTC vs.
Revision 1.134 by root, Thu Dec 16 23:03:50 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
31#include <cstddef> 31#include <cstddef>
32#include <cstdarg> 32#include <cstdarg>
33 33
34#include "unistd.h" 34#include "unistd.h"
35 35
36#include "iom.h" 36#include "ev_cpp.h"
37#include "rxvt.h" 37#include "rxvt.h"
38#include "keyboard.h" 38#include "keyboard.h"
39#include "rxvtutil.h" 39#include "rxvtutil.h"
40#include "rxvtperl.h" 40#include "rxvtperl.h"
41 41
42#include "perlxsi.c" 42#include "perlxsi.c"
43 43
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 44#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 45
50#undef LINENO 46#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 47#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 48#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 49#define ROW(n) THIS->row_buf [LINENO (n)]
… …
73 69
74 return sv; 70 return sv;
75} 71}
76 72
77static SV * 73static SV *
78new_ref (HV *hv, const char *klass)
79{
80 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
81}
82
83static SV *
84newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
85{ 75{
86 HV *hv = newHV (); 76 HV *hv = newHV ();
87 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
88 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
117 107
118///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
119 109
120#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
121 111
122class overlay { 112class overlay : overlay_base
113{
123 rxvt_term *THIS; 114 rxvt_term *THIS;
124 AV *overlay_av; 115 AV *overlay_av;
125 int x, y, w, h;
126 int border; 116 int border;
127 text_t **text;
128 rend_t **rend;
129 117
130public: 118public:
131 HV *self; 119 HV *self;
132 120
133 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 121 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
140 128
141 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
142}; 130};
143 131
144overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 132overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
145: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 133: THIS(THIS), border(border == 2), overlay_av (0)
146{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
147 if (w < 0) w = 0; 140 if (w < 0) w = 0;
148 if (h < 0) h = 0; 141 if (h < 0) h = 0;
149 142
150 if (border == 2) 143 if (border == 2)
151 { 144 {
… …
220 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
221 )); 214 ));
222 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
223 216
224 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
225} 219}
226 220
227void 221void
228overlay::hide () 222overlay::hide ()
229{ 223{
… …
243 237
244 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
245 overlay_av = 0; 239 overlay_av = 0;
246 240
247 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
248} 243}
249 244
250void overlay::swap () 245void overlay::swap ()
251{ 246{
252 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 247 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
253 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 248 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
254 249
255 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
256 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
252
253 // hide cursor if it is within the overlay area
254 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
255 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
256 THIS->screen.flags &= ~Screen_VisibleCursor;
257 257
258 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
259 { 259 {
260 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
261 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
299 } 299 }
300 300
301 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
302} 303}
303 304
304///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
305 306
306#define IOM_CLASS "urxvt" 307#define IOM_CLASS "urxvt"
308#define IOM_WARN rxvt_warn
307#include <iom_perl.h> 309#include "iom_perl.h"
308 310
309///////////////////////////////////////////////////////////////////////////// 311/////////////////////////////////////////////////////////////////////////////
310 312
311struct rxvt_perl_interp rxvt_perl; 313struct rxvt_perl_interp rxvt_perl;
312 314
… …
316{ 318{
317 if (perl) 319 if (perl)
318 { 320 {
319 perl_destruct (perl); 321 perl_destruct (perl);
320 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
321 } 324 }
322} 325}
323 326
324void 327void
325rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
326{ 329{
327 if (!perl) 330 if (!perl)
328 { 331 {
329 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
330 333
334 {
331 perl_environ = rxvt_environ; 335 perl_environ = rxvt_environ;
332 swap (perl_environ, environ); 336 localise_env set_environ (perl_environ);
333 337
334 char *argv[] = { 338 char *args[] = {
335 "", 339 "",
336 "-e" 340 "-e"
337 "BEGIN {" 341 "BEGIN {"
338 " urxvt->bootstrap;" 342 " urxvt->bootstrap;"
339 " unshift @INC, '" LIBDIR "';" 343 " unshift @INC, '" LIBDIR "';"
340 "}" 344 "}"
341 "" 345 ""
342 "use urxvt;" 346 "use urxvt;"
343 }; 347 };
348 int argc = sizeof (args) / sizeof (args[0]);
349 char **argv = args;
344 350
351 PERL_SYS_INIT3 (&argc, &argv, &environ);
345 perl = perl_alloc (); 352 perl = perl_alloc ();
346 perl_construct (perl); 353 perl_construct (perl);
347 354
348 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 355 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
349 || perl_run (perl)) 356 || perl_run (perl))
350 { 357 {
351 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 358 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
352 359
353 perl_destruct (perl); 360 perl_destruct (perl);
354 perl_free (perl); 361 perl_free (perl);
355 perl = 0; 362 perl = 0;
356 } 363 }
357 364 }
358 swap (perl_environ, environ);
359 365
360 rxvt_pop_locale (); 366 rxvt_pop_locale ();
361 } 367 }
362 368
363 if (perl) 369 if (perl)
… …
383rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 389rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
384{ 390{
385 if (!perl || !term->perl.self) 391 if (!perl || !term->perl.self)
386 return false; 392 return false;
387 393
394 localise_env set_environ (perl_environ);
395
388 // pre-handling of some events 396 // pre-handling of some events
389 if (htype == HOOK_REFRESH_END) 397 if (htype == HOOK_REFRESH_END)
390 { 398 {
391 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 399 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
392 400
393 for (int i = 0; i <= AvFILL (av); i++) 401 for (int i = 0; i <= AvFILL (av); i++)
394 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 402 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
395 } 403 }
396 404
397 swap (perl_environ, environ);
398
399 bool event_consumed; 405 bool event_consumed;
400 406
401 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 407 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
402 || term->perl.should_invoke [htype]) 408 || term->perl.should_invoke [htype])
403 try
404 { 409 {
405 dSP; 410 dSP;
406 va_list ap; 411 va_list ap;
407 412
408 va_start (ap, htype); 413 va_start (ap, htype);
409 414
410 ENTER; 415 ENTER;
411 SAVETMPS; 416 SAVETMPS;
412 417
413 PUSHMARK (SP); 418 PUSHMARK (SP);
414 419
415 XPUSHs (sv_2mortal (newSVterm (term))); 420 XPUSHs (sv_2mortal (newSVterm (term)));
416 XPUSHs (sv_2mortal (newSViv (htype))); 421 XPUSHs (sv_2mortal (newSViv (htype)));
417 422
418 for (;;) { 423 for (;;) {
419 data_type dt = (data_type)va_arg (ap, int); 424 data_type dt = (data_type)va_arg (ap, int);
420 425
421 switch (dt) 426 switch (dt)
422 { 427 {
423 case DT_INT: 428 case DT_INT:
424 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 429 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
425 break; 430 break;
426 431
427 case DT_LONG: 432 case DT_LONG:
428 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 433 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
429 break; 434 break;
430 435
431 case DT_STR: 436 case DT_STR:
432 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 437 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
433 break; 438 break;
434 439
435 case DT_STR_LEN: 440 case DT_STR_LEN:
436 { 441 {
437 char *str = va_arg (ap, char *); 442 char *str = va_arg (ap, char *);
438 int len = va_arg (ap, int); 443 int len = va_arg (ap, int);
439 444
440 XPUSHs (sv_2mortal (newSVpvn (str, len))); 445 XPUSHs (sv_2mortal (newSVpvn (str, len)));
441 } 446 }
442 break; 447 break;
443 448
444 case DT_WCS_LEN: 449 case DT_WCS_LEN:
445 { 450 {
446 wchar_t *wstr = va_arg (ap, wchar_t *); 451 wchar_t *wstr = va_arg (ap, wchar_t *);
447 int wlen = va_arg (ap, int); 452 int wlen = va_arg (ap, int);
448 453
449 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 454 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
450 } 455 }
451 break; 456 break;
452 457
453 case DT_LCS_LEN: 458 case DT_LCS_LEN:
454 { 459 {
455 long *lstr = va_arg (ap, long *); 460 long *lstr = va_arg (ap, long *);
456 int llen = va_arg (ap, int); 461 int llen = va_arg (ap, int);
457 462
458 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 463 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
459 } 464 }
460 break; 465 break;
461 466
462 case DT_XEVENT: 467 case DT_XEVENT:
463 { 468 {
464 XEvent *xe = va_arg (ap, XEvent *); 469 XEvent *xe = va_arg (ap, XEvent *);
465 HV *hv = newHV (); 470 HV *hv = newHV ();
466 471
467# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 472# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
468# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 473# 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) 474# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
470# undef set 475# undef set
471 476
472 setiv (type, xe->type); 477 setiv (type, xe->type);
473 setiv (send_event, xe->xany.send_event); 478 setiv (send_event, xe->xany.send_event);
474 setiv (serial, xe->xany.serial); 479 setiv (serial, xe->xany.serial);
475 480
476 switch (xe->type) 481 switch (xe->type)
477 { 482 {
478 case KeyPress: 483 case KeyPress:
479 case KeyRelease: 484 case KeyRelease:
480 case ButtonPress: 485 case ButtonPress:
481 case ButtonRelease: 486 case ButtonRelease:
482 case MotionNotify: 487 case MotionNotify:
483 setuv (window, xe->xmotion.window); 488 setuv (window, xe->xmotion.window);
484 setuv (root, xe->xmotion.root); 489 setuv (root, xe->xmotion.root);
485 setuv (subwindow, xe->xmotion.subwindow); 490 setuv (subwindow, xe->xmotion.subwindow);
486 setuv (time, xe->xmotion.time); 491 setuv (time, xe->xmotion.time);
487 setiv (x, xe->xmotion.x); 492 setiv (x, xe->xmotion.x);
488 setiv (y, xe->xmotion.y); 493 setiv (y, xe->xmotion.y);
489 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 494 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
490 setiv (col, xe->xmotion.x / term->fwidth); 495 setiv (col, xe->xmotion.x / term->fwidth);
491 setiv (x_root, xe->xmotion.x_root); 496 setiv (x_root, xe->xmotion.x_root);
492 setiv (y_root, xe->xmotion.y_root); 497 setiv (y_root, xe->xmotion.y_root);
493 setuv (state, xe->xmotion.state); 498 setuv (state, xe->xmotion.state);
494 499
495 switch (xe->type) 500 switch (xe->type)
496 { 501 {
497 case KeyPress: 502 case KeyPress:
498 case KeyRelease: 503 case KeyRelease:
499 setuv (keycode, xe->xkey.keycode); 504 setuv (keycode, xe->xkey.keycode);
500 break; 505 break;
501 506
502 case ButtonPress: 507 case ButtonPress:
503 case ButtonRelease: 508 case ButtonRelease:
504 setuv (button, xe->xbutton.button); 509 setuv (button, xe->xbutton.button);
505 break; 510 break;
506 511
507 case MotionNotify: 512 case MotionNotify:
508 setiv (is_hint, xe->xmotion.is_hint); 513 setiv (is_hint, xe->xmotion.is_hint);
509 break; 514 break;
510 } 515 }
511 516
512 break; 517 break;
513 518
514 case MapNotify: 519 case MapNotify:
515 case UnmapNotify: 520 case UnmapNotify:
516 case ConfigureNotify: 521 case ConfigureNotify:
517 setuv (event, xe->xconfigure.event); 522 setuv (event, xe->xconfigure.event);
518 setuv (window, xe->xconfigure.window); 523 setuv (window, xe->xconfigure.window);
519 524
520 switch (xe->type) 525 switch (xe->type)
521 { 526 {
522 case ConfigureNotify: 527 case ConfigureNotify:
523 setiv (x, xe->xconfigure.x); 528 setiv (x, xe->xconfigure.x);
524 setiv (y, xe->xconfigure.y); 529 setiv (y, xe->xconfigure.y);
525 setiv (width, xe->xconfigure.width); 530 setiv (width, xe->xconfigure.width);
526 setiv (height, xe->xconfigure.height); 531 setiv (height, xe->xconfigure.height);
527 setuv (above, xe->xconfigure.above); 532 setuv (above, xe->xconfigure.above);
528 break; 533 break;
529 } 534 }
530 535
531 break; 536 break;
532 537
533 case PropertyNotify: 538 case PropertyNotify:
534 setuv (window, xe->xproperty.window); 539 setuv (window, xe->xproperty.window);
535 setuv (atom, xe->xproperty.atom); 540 setuv (atom, xe->xproperty.atom);
536 setuv (time, xe->xproperty.time); 541 setuv (time, xe->xproperty.time);
537 setiv (state, xe->xproperty.state); 542 setiv (state, xe->xproperty.state);
538 break; 543 break;
539 544
540 case ClientMessage: 545 case ClientMessage:
541 setuv (window, xe->xclient.window); 546 setuv (window, xe->xclient.window);
542 setuv (message_type, xe->xclient.message_type); 547 setuv (message_type, xe->xclient.message_type);
543 setuv (format, xe->xclient.format); 548 setuv (format, xe->xclient.format);
544 setuv (l0, xe->xclient.data.l[0]); 549 setuv (l0, xe->xclient.data.l[0]);
545 setuv (l1, xe->xclient.data.l[1]); 550 setuv (l1, xe->xclient.data.l[1]);
546 setuv (l2, xe->xclient.data.l[2]); 551 setuv (l2, xe->xclient.data.l[2]);
547 setuv (l3, xe->xclient.data.l[3]); 552 setuv (l3, xe->xclient.data.l[3]);
548 setuv (l4, xe->xclient.data.l[4]); 553 setuv (l4, xe->xclient.data.l[4]);
549 break; 554 break;
550 } 555 }
551 556
552 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 557 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
553 } 558 }
554 break; 559 break;
555 560
556 case DT_END: 561 case DT_END:
557 goto call; 562 goto call;
558 563
559 default: 564 default:
560 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 565 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
561 } 566 }
567 }
568
569 call:
570 va_end (ap);
571
572 PUTBACK;
573 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
574 SPAGAIN;
575
576 if (count)
577 {
578 SV *status = POPs;
579 count = SvTRUE (status);
562 } 580 }
563 581
564 call:
565 va_end (ap);
566
567 PUTBACK; 582 PUTBACK;
568 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
569 SPAGAIN;
570
571 if (count)
572 {
573 SV *status = POPs;
574 count = SvTRUE (status);
575 }
576
577 PUTBACK;
578 FREETMPS; 583 FREETMPS;
579 LEAVE; 584 LEAVE;
580 585
581 if (SvTRUE (ERRSV)) 586 if (SvTRUE (ERRSV))
582 { 587 {
583 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 588 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
584 ungrab (term); // better lose the grab than the session 589 ungrab (term); // better lose the grab than the session
585 } 590 }
586 591
587 event_consumed = !!count; 592 event_consumed = !!count;
588 } 593 }
589 catch (...)
590 {
591 swap (perl_environ, environ);
592 throw;
593 }
594 else 594 else
595 event_consumed = false; 595 event_consumed = false;
596 596
597 // post-handling of some events 597 // post-handling of some events
598 if (htype == HOOK_REFRESH_BEGIN) 598 if (htype == HOOK_REFRESH_BEGIN)
599 { 599 {
600 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 600 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
601 601
602 for (int i = AvFILL (av); i >= 0; i--) 602 for (int i = AvFILL (av); i >= 0; i--)
603 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 603 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
604 } 604 }
605 else if (htype == HOOK_DESTROY) 605 else if (htype == HOOK_DESTROY)
606 { 606 {
607 clearSVptr ((SV *)term->perl.self); 607 clearSVptr ((SV *)term->perl.self);
608 SvREFCNT_dec ((SV *)term->perl.self); 608 SvREFCNT_dec ((SV *)term->perl.self);
609 609
610 // don't allow further calls 610 // don't allow further calls
611 term->perl.self = 0; 611 term->perl.self = 0;
612 } 612 }
613
614 swap (perl_environ, environ);
615 613
616 return event_consumed; 614 return event_consumed;
617} 615}
618 616
619///////////////////////////////////////////////////////////////////////////// 617/////////////////////////////////////////////////////////////////////////////
… …
633# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 631# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
634# include "hookinc.h" 632# include "hookinc.h"
635# undef def 633# undef def
636 634
637 HV *option = get_hv ("urxvt::OPTION", 1); 635 HV *option = get_hv ("urxvt::OPTION", 1);
638# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 636# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
639# define nodef(name) 637# define nodef(name)
640# include "optinc.h" 638# include "optinc.h"
641# undef nodef 639# undef nodef
642# undef def 640# undef def
643 641
… …
645 static const struct { 643 static const struct {
646 const char *name; 644 const char *name;
647 IV iv; 645 IV iv;
648 } *civ, const_iv[] = { 646 } *civ, const_iv[] = {
649# define const_iv(name) { # name, (IV)name } 647# define const_iv(name) { # name, (IV)name }
648 const_iv (NUM_RESOURCES),
650 const_iv (DEFAULT_RSTYLE), 649 const_iv (DEFAULT_RSTYLE),
651 const_iv (OVERLAY_RSTYLE), 650 const_iv (OVERLAY_RSTYLE),
651 const_iv (Color_Bits),
652 const_iv (RS_bgShift), const_iv (RS_bgMask),
653 const_iv (RS_fgShift), const_iv (RS_fgMask),
654 const_iv (RS_Careful),
655 const_iv (RS_fontCount),
656 const_iv (RS_fontShift),
657 const_iv (RS_fontMask),
658 const_iv (RS_baseattrMask),
659 const_iv (RS_attrMask),
660 const_iv (RS_redraw),
661 const_iv (RS_Sel),
652 const_iv (RS_Bold), 662 const_iv (RS_Bold),
653 const_iv (RS_Italic), 663 const_iv (RS_Italic),
654 const_iv (RS_Blink), 664 const_iv (RS_Blink),
655 const_iv (RS_RVid), 665 const_iv (RS_RVid),
656 const_iv (RS_Uline), 666 const_iv (RS_Uline),
… …
780_exit (int status) 790_exit (int status)
781 791
782NV 792NV
783NOW () 793NOW ()
784 CODE: 794 CODE:
785 RETVAL = NOW; 795 RETVAL = ev::now ();
786 OUTPUT: 796 OUTPUT:
787 RETVAL 797 RETVAL
788 798
789int 799int
790GET_BASEFG (int rend) 800GET_BASEFG (int rend)
… …
862 for (int i = AvFILL (env) + 1; i--; ) 872 for (int i = AvFILL (env) + 1; i--; )
863 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 873 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
864 874
865 envv->push_back (0); 875 envv->push_back (0);
866 876
867 bool success;
868
869 try 877 try
870 { 878 {
871 success = term->init (argv, envv); 879 term->init (argv, envv);
872 } 880 }
873 catch (const class rxvt_failure_exception &e) 881 catch (const class rxvt_failure_exception &e)
874 {
875 success = false;
876 }
877
878 if (!success)
879 { 882 {
880 term->destroy (); 883 term->destroy ();
881 croak ("error while initializing new terminal instance"); 884 croak ("error while initializing new terminal instance");
882 } 885 }
883 886
… …
1055 OUTPUT: 1058 OUTPUT:
1056 RETVAL 1059 RETVAL
1057 1060
1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1061#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1059 1062
1060#define TERM_OFFSET_width TERM_OFFSET(width) 1063#define TERM_OFFSET_width TERM_OFFSET(width)
1061#define TERM_OFFSET_height TERM_OFFSET(height) 1064#define TERM_OFFSET_height TERM_OFFSET(height)
1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1065#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1066#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1067#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1068#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1069#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1067#define TERM_OFFSET_focus TERM_OFFSET(focus) 1070#define TERM_OFFSET_focus TERM_OFFSET(focus)
1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1071#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1072#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1073#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1074#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1075#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1072#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1076#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1073#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1077#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1074#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1078#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1075 1079
1076int 1080int
1077rxvt_term::width () 1081rxvt_term::width ()
1078 ALIAS: 1082 ALIAS:
1079 width = TERM_OFFSET_width 1083 width = TERM_OFFSET_width
1080 height = TERM_OFFSET_height 1084 height = TERM_OFFSET_height
1081 fwidth = TERM_OFFSET_fwidth 1085 fwidth = TERM_OFFSET_fwidth
1082 fheight = TERM_OFFSET_fheight 1086 fheight = TERM_OFFSET_fheight
1083 fbase = TERM_OFFSET_fbase 1087 fbase = TERM_OFFSET_fbase
1084 nrow = TERM_OFFSET_nrow 1088 nrow = TERM_OFFSET_nrow
1085 ncol = TERM_OFFSET_ncol 1089 ncol = TERM_OFFSET_ncol
1086 focus = TERM_OFFSET_focus 1090 focus = TERM_OFFSET_focus
1087 mapped = TERM_OFFSET_mapped 1091 mapped = TERM_OFFSET_mapped
1088 int_bwidth = TERM_OFFSET_int_bwidth 1092 int_bwidth = TERM_OFFSET_int_bwidth
1089 ext_bwidth = TERM_OFFSET_ext_bwidth 1093 ext_bwidth = TERM_OFFSET_ext_bwidth
1090 lineSpace = TERM_OFFSET_lineSpace 1094 lineSpace = TERM_OFFSET_lineSpace
1095 letterSpace = TERM_OFFSET_letterSpace
1091 saveLines = TERM_OFFSET_saveLines 1096 saveLines = TERM_OFFSET_saveLines
1092 total_rows = TERM_OFFSET_total_rows 1097 total_rows = TERM_OFFSET_total_rows
1093 top_row = TERM_OFFSET_top_row 1098 top_row = TERM_OFFSET_top_row
1094 CODE: 1099 CODE:
1095 RETVAL = *(int *)((char *)THIS + ix); 1100 RETVAL = *(int *)((char *)THIS + ix);
1096 OUTPUT: 1101 OUTPUT:
1097 RETVAL 1102 RETVAL
1098 1103
… …
1109 { 1114 {
1110 case 0: RETVAL = THIS->ModLevel3Mask; break; 1115 case 0: RETVAL = THIS->ModLevel3Mask; break;
1111 case 1: RETVAL = THIS->ModMetaMask; break; 1116 case 1: RETVAL = THIS->ModMetaMask; break;
1112 case 2: RETVAL = THIS->ModNumLockMask; break; 1117 case 2: RETVAL = THIS->ModNumLockMask; break;
1113 case 3: RETVAL = THIS->current_screen; break; 1118 case 3: RETVAL = THIS->current_screen; break;
1119#ifdef CURSOR_BLINK
1114 case 4: RETVAL = THIS->hidden_cursor; break; 1120 case 4: RETVAL = THIS->hidden_cursor; break;
1121#endif
1115 } 1122 }
1116 OUTPUT: 1123 OUTPUT:
1117 RETVAL 1124 RETVAL
1118 1125
1119char * 1126char *
… …
1144 if (*i) 1151 if (*i)
1145 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1152 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1146} 1153}
1147 1154
1148int 1155int
1149rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1156rxvt_term::pty_ev_events (int events = ev::UNDEF)
1150 CODE: 1157 CODE:
1151 RETVAL = THIS->pty_ev.events; 1158 RETVAL = THIS->pty_ev.events;
1152 if (events != EVENT_UNDEF) 1159 if (events != ev::UNDEF)
1153 THIS->pty_ev.set (events); 1160 THIS->pty_ev.set (events);
1154 OUTPUT: 1161 OUTPUT:
1155 RETVAL 1162 RETVAL
1156 1163
1157int 1164int
… …
1236 1243
1237void 1244void
1238rxvt_term::want_refresh () 1245rxvt_term::want_refresh ()
1239 CODE: 1246 CODE:
1240 THIS->want_refresh = 1; 1247 THIS->want_refresh = 1;
1248 THIS->refresh_check ();
1241 1249
1242void 1250void
1243rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1251rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1244 PPCODE: 1252 PPCODE:
1245{ 1253{
… …
1400SV * 1408SV *
1401rxvt_term::special_decode (SV *text) 1409rxvt_term::special_decode (SV *text)
1402 CODE: 1410 CODE:
1403{ 1411{
1404 wchar_t *wstr = sv2wcs (text); 1412 wchar_t *wstr = sv2wcs (text);
1405 int wlen = wcslen (wstr);
1406 int dlen = 0; 1413 int dlen = 0;
1407 1414
1408 // find length 1415 // find length
1409 for (wchar_t *s = wstr; *s; s++) 1416 for (wchar_t *s = wstr; *s; s++)
1410 if (*s == NOCHAR) 1417 if (*s == NOCHAR)
… …
1443# undef reserve 1450# undef reserve
1444 }; 1451 };
1445 1452
1446 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1453 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1447 1454
1455 if (*name)
1448 do { 1456 {
1457 do {
1449 if (rs-- == rslist) 1458 if (rs-- == rslist)
1450 croak ("no such resource '%s', requested", name); 1459 croak ("no such resource '%s', requested", name);
1451 } while (strcmp (name, rs->name)); 1460 } while (strcmp (name, rs->name));
1452 1461
1453 index += rs->value; 1462 index += rs->value;
1463 }
1464 else
1465 {
1466 --rs;
1467 name = "";
1468 }
1454 1469
1455 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1470 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1456 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1471 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1457 1472
1458 if (GIMME_V != G_VOID) 1473 if (GIMME_V != G_VOID)
… …
1473 1488
1474const char * 1489const char *
1475rxvt_term::x_resource (const char *name) 1490rxvt_term::x_resource (const char *name)
1476 1491
1477bool 1492bool
1478rxvt_term::option (U32 optval, int set = -1) 1493rxvt_term::option (U8 optval, int set = -1)
1479 CODE: 1494 CODE:
1480{ 1495{
1481 RETVAL = THIS->options & optval; 1496 RETVAL = THIS->option (optval);
1482 1497
1483 if (set >= 0) 1498 if (set >= 0)
1484 { 1499 {
1485 if (set)
1486 THIS->options |= optval; 1500 THIS->set_option (optval, set);
1487 else
1488 THIS->options &= ~optval;
1489 1501
1490 if (THIS->check_ev.is_active ()) // avoid doing this before START 1502 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1491 switch (optval) 1503 switch (optval)
1492 { 1504 {
1493 case Opt_skipBuiltinGlyphs: 1505 case Opt_skipBuiltinGlyphs:
1494 THIS->set_fonts (); 1506 THIS->set_fonts ();
1495 THIS->scr_remap_chars (); 1507 THIS->scr_remap_chars ();
1496 THIS->scr_touch (true); 1508 THIS->scr_touch (true);
1497 THIS->want_refresh = 1; 1509 THIS->want_refresh = 1;
1510 THIS->refresh_check ();
1498 break; 1511 break;
1499 1512
1500 case Opt_cursorUnderline: 1513 case Opt_cursorUnderline:
1501 THIS->want_refresh = 1; 1514 THIS->want_refresh = 1;
1515 THIS->refresh_check ();
1502 break; 1516 break;
1503 1517
1504# case Opt_scrollBar_floating: 1518# case Opt_scrollBar_floating:
1505# case Opt_scrollBar_right: 1519# case Opt_scrollBar_right:
1506# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1520# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1539 EXTEND (SP, 2); 1553 EXTEND (SP, 2);
1540 PUSHs (sv_2mortal (newSViv (rc.row))); 1554 PUSHs (sv_2mortal (newSViv (rc.row)));
1541 PUSHs (sv_2mortal (newSViv (rc.col))); 1555 PUSHs (sv_2mortal (newSViv (rc.col)));
1542 } 1556 }
1543 1557
1544 if (items == 3) 1558 if (items >= 3)
1545 { 1559 {
1546 rc.row = SvIV (ST (1)); 1560 rc.row = SvIV (ST (1));
1547 rc.col = SvIV (ST (2)); 1561 rc.col = SvIV (ST (2));
1548 1562
1549 if (ix == 2) 1563 if (ix == 2)
… …
1564 1578
1565 clamp_it (rc.col, 0, THIS->ncol); 1579 clamp_it (rc.col, 0, THIS->ncol);
1566 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1580 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1567 1581
1568 if (ix) 1582 if (ix)
1583 {
1584 THIS->selection.screen = THIS->current_screen;
1585
1569 THIS->want_refresh = 1; 1586 THIS->want_refresh = 1;
1587 THIS->refresh_check ();
1570 } 1588 }
1589 }
1571} 1590}
1572 1591
1573char 1592int
1574rxvt_term::cur_charset () 1593rxvt_term::selection_screen (int screen = -1)
1575 CODE: 1594 CODE:
1576 RETVAL = THIS->charsets [THIS->screen.charset]; 1595 RETVAL = THIS->selection.screen;
1577 OUTPUT: 1596 if (screen >= 0)
1597 THIS->selection.screen = screen;
1598 OUTPUT:
1578 RETVAL 1599 RETVAL
1579 1600
1580void 1601void
1581rxvt_term::selection_clear () 1602rxvt_term::selection_clear (bool clipboard = false)
1582 1603
1583void 1604void
1584rxvt_term::selection_make (Time eventtime, bool rect = false) 1605rxvt_term::selection_make (Time eventtime, bool rect = false)
1585 CODE: 1606 CODE:
1586 THIS->selection.op = SELECTION_CONT; 1607 THIS->selection.op = SELECTION_CONT;
1587 THIS->selection.rect = rect; 1608 THIS->selection.rect = rect;
1588 THIS->selection_make (eventtime); 1609 THIS->selection_make (eventtime);
1589 1610
1590int 1611int
1591rxvt_term::selection_grab (Time eventtime) 1612rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1592 1613
1593void 1614void
1594rxvt_term::selection (SV *newtext = 0) 1615rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1595 PPCODE: 1616 PPCODE:
1596{ 1617{
1618 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1619 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1620
1597 if (GIMME_V != G_VOID) 1621 if (GIMME_V != G_VOID)
1598 XPUSHs (THIS->selection.text 1622 XPUSHs (text
1599 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1623 ? sv_2mortal (wcs2sv (text, len))
1600 : &PL_sv_undef); 1624 : &PL_sv_undef);
1601 1625
1602 if (newtext) 1626 if (newtext)
1603 { 1627 {
1604 free (THIS->selection.text); 1628 free (text);
1605 1629
1606 THIS->selection.text = sv2wcs (newtext); 1630 text = sv2wcs (newtext);
1607 THIS->selection.len = wcslen (THIS->selection.text); 1631 len = wcslen (text);
1608 } 1632 }
1609} 1633}
1634
1635char
1636rxvt_term::cur_charset ()
1637 CODE:
1638 RETVAL = THIS->charsets [THIS->screen.charset];
1639 OUTPUT:
1640 RETVAL
1610 1641
1611void 1642void
1612rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1643rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1613 1644
1614void 1645void
… …
1636 char *str = SvPVbyte (octets, len); 1667 char *str = SvPVbyte (octets, len);
1637 C_ARGS: 1668 C_ARGS:
1638 str, len 1669 str, len
1639 1670
1640void 1671void
1672rxvt_term::tt_paste (SV *octets)
1673 INIT:
1674 STRLEN len;
1675 char *str = SvPVbyte (octets, len);
1676 C_ARGS:
1677 str, len
1678
1679void
1641rxvt_term::cmd_parse (SV *octets) 1680rxvt_term::cmd_parse (SV *octets)
1642 CODE: 1681 CODE:
1643{ 1682{
1644 STRLEN len; 1683 STRLEN len;
1645 char *str = SvPVbyte (octets, len); 1684 char *str = SvPVbyte (octets, len);
… …
1681 Atom *props = XListProperties (THIS->dpy, window, &count); 1720 Atom *props = XListProperties (THIS->dpy, window, &count);
1682 1721
1683 EXTEND (SP, count); 1722 EXTEND (SP, count);
1684 while (count--) 1723 while (count--)
1685 PUSHs (newSVuv ((U32)props [count])); 1724 PUSHs (newSVuv ((U32)props [count]));
1686 1725
1687 XFree (props); 1726 XFree (props);
1688} 1727}
1689 1728
1690void 1729void
1691rxvt_term::XGetWindowProperty (Window window, Atom property) 1730rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1714 XFree (prop); 1753 XFree (prop);
1715 } 1754 }
1716} 1755}
1717 1756
1718void 1757void
1719rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1758rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1720 CODE: 1759 CODE:
1721{ 1760{
1722 STRLEN len; 1761 STRLEN len;
1723 char *data_ = SvPVbyte (data, len); 1762 char *data_ = SvPVbyte (data, len);
1724 1763

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines