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.112 by root, Thu Dec 14 17:40:03 2006 UTC vs.
Revision 1.136 by root, Fri Jan 7 21:17:08 2011 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_WARN rxvt_warn
308#include <iom_perl.h> 307#include "iom_perl.h"
309 308
310///////////////////////////////////////////////////////////////////////////// 309/////////////////////////////////////////////////////////////////////////////
311 310
312struct rxvt_perl_interp rxvt_perl; 311struct rxvt_perl_interp rxvt_perl;
313 312
… …
317{ 316{
318 if (perl) 317 if (perl)
319 { 318 {
320 perl_destruct (perl); 319 perl_destruct (perl);
321 perl_free (perl); 320 perl_free (perl);
321 PERL_SYS_TERM ();
322 } 322 }
323} 323}
324 324
325void 325void
326rxvt_perl_interp::init (rxvt_term *term) 326rxvt_perl_interp::init (rxvt_term *term)
327{ 327{
328 if (!perl) 328 if (!perl)
329 { 329 {
330 rxvt_push_locale (""); // perl init destroys current locale 330 rxvt_push_locale (""); // perl init destroys current locale
331 331
332 {
332 perl_environ = rxvt_environ; 333 perl_environ = rxvt_environ;
333 swap (perl_environ, environ); 334 localise_env set_environ (perl_environ);
334 335
335 char *argv[] = { 336 char *args[] = {
336 "", 337 "",
337 "-e" 338 "-e"
338 "BEGIN {" 339 "BEGIN {"
339 " urxvt->bootstrap;" 340 " urxvt->bootstrap;"
340 " unshift @INC, '" LIBDIR "';" 341 " unshift @INC, '" LIBDIR "';"
341 "}" 342 "}"
342 "" 343 ""
343 "use urxvt;" 344 "use urxvt;"
344 }; 345 };
346 int argc = ARRAY_LENGTH(args);
347 char **argv = args;
345 348
349 PERL_SYS_INIT3 (&argc, &argv, &environ);
346 perl = perl_alloc (); 350 perl = perl_alloc ();
347 perl_construct (perl); 351 perl_construct (perl);
348 352
349 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 353 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
350 || perl_run (perl)) 354 || perl_run (perl))
351 { 355 {
352 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 356 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
353 357
354 perl_destruct (perl); 358 perl_destruct (perl);
355 perl_free (perl); 359 perl_free (perl);
356 perl = 0; 360 perl = 0;
357 } 361 }
358 362 }
359 swap (perl_environ, environ);
360 363
361 rxvt_pop_locale (); 364 rxvt_pop_locale ();
362 } 365 }
363 366
364 if (perl) 367 if (perl)
… …
384rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 387rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
385{ 388{
386 if (!perl || !term->perl.self) 389 if (!perl || !term->perl.self)
387 return false; 390 return false;
388 391
392 localise_env set_environ (perl_environ);
393
389 // pre-handling of some events 394 // pre-handling of some events
390 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
391 { 396 {
392 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 397 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
393 398
394 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
395 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
396 } 401 }
397 402
398 swap (perl_environ, environ);
399
400 bool event_consumed; 403 bool event_consumed;
401 404
402 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 405 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
403 || term->perl.should_invoke [htype]) 406 || term->perl.should_invoke [htype])
404 try
405 { 407 {
406 dSP; 408 dSP;
407 va_list ap; 409 va_list ap;
408 410
409 va_start (ap, htype); 411 va_start (ap, htype);
410 412
411 ENTER; 413 ENTER;
412 SAVETMPS; 414 SAVETMPS;
413 415
414 PUSHMARK (SP); 416 PUSHMARK (SP);
415 417
416 XPUSHs (sv_2mortal (newSVterm (term))); 418 XPUSHs (sv_2mortal (newSVterm (term)));
417 XPUSHs (sv_2mortal (newSViv (htype))); 419 XPUSHs (sv_2mortal (newSViv (htype)));
418 420
419 for (;;) { 421 for (;;) {
420 data_type dt = (data_type)va_arg (ap, int); 422 data_type dt = (data_type)va_arg (ap, int);
421 423
422 switch (dt) 424 switch (dt)
423 { 425 {
424 case DT_INT: 426 case DT_INT:
425 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 427 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
426 break; 428 break;
427 429
428 case DT_LONG: 430 case DT_LONG:
429 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 431 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
430 break; 432 break;
431 433
432 case DT_STR: 434 case DT_STR:
433 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 435 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
434 break; 436 break;
435 437
436 case DT_STR_LEN: 438 case DT_STR_LEN:
437 { 439 {
438 char *str = va_arg (ap, char *); 440 char *str = va_arg (ap, char *);
439 int len = va_arg (ap, int); 441 int len = va_arg (ap, int);
440 442
441 XPUSHs (sv_2mortal (newSVpvn (str, len))); 443 XPUSHs (sv_2mortal (newSVpvn (str, len)));
442 } 444 }
443 break; 445 break;
444 446
445 case DT_WCS_LEN: 447 case DT_WCS_LEN:
446 { 448 {
447 wchar_t *wstr = va_arg (ap, wchar_t *); 449 wchar_t *wstr = va_arg (ap, wchar_t *);
448 int wlen = va_arg (ap, int); 450 int wlen = va_arg (ap, int);
449 451
450 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 452 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
451 } 453 }
452 break; 454 break;
453 455
454 case DT_LCS_LEN: 456 case DT_LCS_LEN:
455 { 457 {
456 long *lstr = va_arg (ap, long *); 458 long *lstr = va_arg (ap, long *);
457 int llen = va_arg (ap, int); 459 int llen = va_arg (ap, int);
458 460
459 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 461 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
460 } 462 }
461 break; 463 break;
462 464
463 case DT_XEVENT: 465 case DT_XEVENT:
464 { 466 {
465 XEvent *xe = va_arg (ap, XEvent *); 467 XEvent *xe = va_arg (ap, XEvent *);
466 HV *hv = newHV (); 468 HV *hv = newHV ();
467 469
468# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 470# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
469# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 471# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
470# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 472# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
471# undef set 473# undef set
472 474
473 setiv (type, xe->type); 475 setiv (type, xe->type);
474 setiv (send_event, xe->xany.send_event); 476 setiv (send_event, xe->xany.send_event);
475 setiv (serial, xe->xany.serial); 477 setiv (serial, xe->xany.serial);
476 478
477 switch (xe->type) 479 switch (xe->type)
478 { 480 {
479 case KeyPress: 481 case KeyPress:
480 case KeyRelease: 482 case KeyRelease:
481 case ButtonPress: 483 case ButtonPress:
482 case ButtonRelease: 484 case ButtonRelease:
483 case MotionNotify: 485 case MotionNotify:
484 setuv (window, xe->xmotion.window); 486 setuv (window, xe->xmotion.window);
485 setuv (root, xe->xmotion.root); 487 setuv (root, xe->xmotion.root);
486 setuv (subwindow, xe->xmotion.subwindow); 488 setuv (subwindow, xe->xmotion.subwindow);
487 setuv (time, xe->xmotion.time); 489 setuv (time, xe->xmotion.time);
488 setiv (x, xe->xmotion.x); 490 setiv (x, xe->xmotion.x);
489 setiv (y, xe->xmotion.y); 491 setiv (y, xe->xmotion.y);
490 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 492 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
491 setiv (col, xe->xmotion.x / term->fwidth); 493 setiv (col, xe->xmotion.x / term->fwidth);
492 setiv (x_root, xe->xmotion.x_root); 494 setiv (x_root, xe->xmotion.x_root);
493 setiv (y_root, xe->xmotion.y_root); 495 setiv (y_root, xe->xmotion.y_root);
494 setuv (state, xe->xmotion.state); 496 setuv (state, xe->xmotion.state);
495 497
496 switch (xe->type) 498 switch (xe->type)
497 { 499 {
498 case KeyPress: 500 case KeyPress:
499 case KeyRelease: 501 case KeyRelease:
500 setuv (keycode, xe->xkey.keycode); 502 setuv (keycode, xe->xkey.keycode);
501 break; 503 break;
502 504
503 case ButtonPress: 505 case ButtonPress:
504 case ButtonRelease: 506 case ButtonRelease:
505 setuv (button, xe->xbutton.button); 507 setuv (button, xe->xbutton.button);
506 break; 508 break;
507 509
508 case MotionNotify: 510 case MotionNotify:
509 setiv (is_hint, xe->xmotion.is_hint); 511 setiv (is_hint, xe->xmotion.is_hint);
510 break; 512 break;
511 } 513 }
512 514
513 break; 515 break;
514 516
515 case MapNotify: 517 case MapNotify:
516 case UnmapNotify: 518 case UnmapNotify:
517 case ConfigureNotify: 519 case ConfigureNotify:
518 setuv (event, xe->xconfigure.event); 520 setuv (event, xe->xconfigure.event);
519 setuv (window, xe->xconfigure.window); 521 setuv (window, xe->xconfigure.window);
520 522
521 switch (xe->type) 523 switch (xe->type)
522 { 524 {
523 case ConfigureNotify: 525 case ConfigureNotify:
524 setiv (x, xe->xconfigure.x); 526 setiv (x, xe->xconfigure.x);
525 setiv (y, xe->xconfigure.y); 527 setiv (y, xe->xconfigure.y);
526 setiv (width, xe->xconfigure.width); 528 setiv (width, xe->xconfigure.width);
527 setiv (height, xe->xconfigure.height); 529 setiv (height, xe->xconfigure.height);
528 setuv (above, xe->xconfigure.above); 530 setuv (above, xe->xconfigure.above);
529 break; 531 break;
530 } 532 }
531 533
532 break; 534 break;
533 535
534 case PropertyNotify: 536 case PropertyNotify:
535 setuv (window, xe->xproperty.window); 537 setuv (window, xe->xproperty.window);
536 setuv (atom, xe->xproperty.atom); 538 setuv (atom, xe->xproperty.atom);
537 setuv (time, xe->xproperty.time); 539 setuv (time, xe->xproperty.time);
538 setiv (state, xe->xproperty.state); 540 setiv (state, xe->xproperty.state);
539 break; 541 break;
540 542
541 case ClientMessage: 543 case ClientMessage:
542 setuv (window, xe->xclient.window); 544 setuv (window, xe->xclient.window);
543 setuv (message_type, xe->xclient.message_type); 545 setuv (message_type, xe->xclient.message_type);
544 setuv (format, xe->xclient.format); 546 setuv (format, xe->xclient.format);
545 setuv (l0, xe->xclient.data.l[0]); 547 setuv (l0, xe->xclient.data.l[0]);
546 setuv (l1, xe->xclient.data.l[1]); 548 setuv (l1, xe->xclient.data.l[1]);
547 setuv (l2, xe->xclient.data.l[2]); 549 setuv (l2, xe->xclient.data.l[2]);
548 setuv (l3, xe->xclient.data.l[3]); 550 setuv (l3, xe->xclient.data.l[3]);
549 setuv (l4, xe->xclient.data.l[4]); 551 setuv (l4, xe->xclient.data.l[4]);
550 break; 552 break;
551 } 553 }
552 554
553 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
554 } 556 }
555 break; 557 break;
556 558
557 case DT_END: 559 case DT_END:
558 goto call; 560 goto call;
559 561
560 default: 562 default:
561 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 563 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
562 } 564 }
565 }
566
567 call:
568 va_end (ap);
569
570 PUTBACK;
571 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
572 SPAGAIN;
573
574 if (count)
575 {
576 SV *status = POPs;
577 count = SvTRUE (status);
563 } 578 }
564 579
565 call:
566 va_end (ap);
567
568 PUTBACK; 580 PUTBACK;
569 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
570 SPAGAIN;
571
572 if (count)
573 {
574 SV *status = POPs;
575 count = SvTRUE (status);
576 }
577
578 PUTBACK;
579 FREETMPS; 581 FREETMPS;
580 LEAVE; 582 LEAVE;
581 583
582 if (SvTRUE (ERRSV)) 584 if (SvTRUE (ERRSV))
583 { 585 {
584 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 586 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
585 ungrab (term); // better lose the grab than the session 587 ungrab (term); // better lose the grab than the session
586 } 588 }
587 589
588 event_consumed = !!count; 590 event_consumed = !!count;
589 } 591 }
590 catch (...)
591 {
592 swap (perl_environ, environ);
593 throw;
594 }
595 else 592 else
596 event_consumed = false; 593 event_consumed = false;
597 594
598 // post-handling of some events 595 // post-handling of some events
599 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
600 { 597 {
601 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 598 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
602 599
603 for (int i = AvFILL (av); i >= 0; i--) 600 for (int i = AvFILL (av); i >= 0; i--)
604 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 601 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
605 } 602 }
606 else if (htype == HOOK_DESTROY) 603 else if (htype == HOOK_DESTROY)
607 { 604 {
608 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
609 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
610 607
611 // don't allow further calls 608 // don't allow further calls
612 term->perl.self = 0; 609 term->perl.self = 0;
613 } 610 }
614
615 swap (perl_environ, environ);
616 611
617 return event_consumed; 612 return event_consumed;
618} 613}
619 614
620///////////////////////////////////////////////////////////////////////////// 615/////////////////////////////////////////////////////////////////////////////
… …
634# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 629# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
635# include "hookinc.h" 630# include "hookinc.h"
636# undef def 631# undef def
637 632
638 HV *option = get_hv ("urxvt::OPTION", 1); 633 HV *option = get_hv ("urxvt::OPTION", 1);
639# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 634# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
640# define nodef(name) 635# define nodef(name)
641# include "optinc.h" 636# include "optinc.h"
642# undef nodef 637# undef nodef
643# undef def 638# undef def
644 639
… …
646 static const struct { 641 static const struct {
647 const char *name; 642 const char *name;
648 IV iv; 643 IV iv;
649 } *civ, const_iv[] = { 644 } *civ, const_iv[] = {
650# define const_iv(name) { # name, (IV)name } 645# define const_iv(name) { # name, (IV)name }
646 const_iv (NUM_RESOURCES),
651 const_iv (DEFAULT_RSTYLE), 647 const_iv (DEFAULT_RSTYLE),
652 const_iv (OVERLAY_RSTYLE), 648 const_iv (OVERLAY_RSTYLE),
649 const_iv (Color_Bits),
650 const_iv (RS_bgShift), const_iv (RS_bgMask),
651 const_iv (RS_fgShift), const_iv (RS_fgMask),
652 const_iv (RS_Careful),
653 const_iv (RS_fontCount),
654 const_iv (RS_fontShift),
655 const_iv (RS_fontMask),
656 const_iv (RS_baseattrMask),
657 const_iv (RS_attrMask),
658 const_iv (RS_redraw),
659 const_iv (RS_Sel),
653 const_iv (RS_Bold), 660 const_iv (RS_Bold),
654 const_iv (RS_Italic), 661 const_iv (RS_Italic),
655 const_iv (RS_Blink), 662 const_iv (RS_Blink),
656 const_iv (RS_RVid), 663 const_iv (RS_RVid),
657 const_iv (RS_Uline), 664 const_iv (RS_Uline),
… …
761 const_iv (XIMDontChange), 768 const_iv (XIMDontChange),
762# endif 769# endif
763# endif 770# endif
764 }; 771 };
765 772
766 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 773 for (civ = const_iv + ARRAY_LENGTH(const_iv); civ-- > const_iv; )
767 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
768} 775}
769 776
770void 777void
771warn (const char *msg) 778warn (const char *msg)
… …
781_exit (int status) 788_exit (int status)
782 789
783NV 790NV
784NOW () 791NOW ()
785 CODE: 792 CODE:
786 RETVAL = NOW; 793 RETVAL = ev::now ();
787 OUTPUT: 794 OUTPUT:
788 RETVAL 795 RETVAL
789 796
790int 797int
791GET_BASEFG (int rend) 798GET_BASEFG (int rend)
… …
863 for (int i = AvFILL (env) + 1; i--; ) 870 for (int i = AvFILL (env) + 1; i--; )
864 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 871 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
865 872
866 envv->push_back (0); 873 envv->push_back (0);
867 874
868 bool success;
869
870 try 875 try
871 { 876 {
872 success = term->init (argv, envv); 877 term->init (argv, envv);
873 } 878 }
874 catch (const class rxvt_failure_exception &e) 879 catch (const class rxvt_failure_exception &e)
875 {
876 success = false;
877 }
878
879 if (!success)
880 { 880 {
881 term->destroy (); 881 term->destroy ();
882 croak ("error while initializing new terminal instance"); 882 croak ("error while initializing new terminal instance");
883 } 883 }
884 884
… …
1056 OUTPUT: 1056 OUTPUT:
1057 RETVAL 1057 RETVAL
1058 1058
1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1060 1060
1061#define TERM_OFFSET_width TERM_OFFSET(width) 1061#define TERM_OFFSET_width TERM_OFFSET(width)
1062#define TERM_OFFSET_height TERM_OFFSET(height) 1062#define TERM_OFFSET_height TERM_OFFSET(height)
1063#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1063#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1064#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1064#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1065#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1065#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1066#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1066#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1067#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1067#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1068#define TERM_OFFSET_focus TERM_OFFSET(focus) 1068#define TERM_OFFSET_focus TERM_OFFSET(focus)
1069#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1069#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1070#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1070#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1071#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1071#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1072#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1072#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1073#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1074#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1075#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1076#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1076 1077
1077int 1078int
1078rxvt_term::width () 1079rxvt_term::width ()
1079 ALIAS: 1080 ALIAS:
1080 width = TERM_OFFSET_width 1081 width = TERM_OFFSET_width
1081 height = TERM_OFFSET_height 1082 height = TERM_OFFSET_height
1082 fwidth = TERM_OFFSET_fwidth 1083 fwidth = TERM_OFFSET_fwidth
1083 fheight = TERM_OFFSET_fheight 1084 fheight = TERM_OFFSET_fheight
1084 fbase = TERM_OFFSET_fbase 1085 fbase = TERM_OFFSET_fbase
1085 nrow = TERM_OFFSET_nrow 1086 nrow = TERM_OFFSET_nrow
1086 ncol = TERM_OFFSET_ncol 1087 ncol = TERM_OFFSET_ncol
1087 focus = TERM_OFFSET_focus 1088 focus = TERM_OFFSET_focus
1088 mapped = TERM_OFFSET_mapped 1089 mapped = TERM_OFFSET_mapped
1089 int_bwidth = TERM_OFFSET_int_bwidth 1090 int_bwidth = TERM_OFFSET_int_bwidth
1090 ext_bwidth = TERM_OFFSET_ext_bwidth 1091 ext_bwidth = TERM_OFFSET_ext_bwidth
1091 lineSpace = TERM_OFFSET_lineSpace 1092 lineSpace = TERM_OFFSET_lineSpace
1093 letterSpace = TERM_OFFSET_letterSpace
1092 saveLines = TERM_OFFSET_saveLines 1094 saveLines = TERM_OFFSET_saveLines
1093 total_rows = TERM_OFFSET_total_rows 1095 total_rows = TERM_OFFSET_total_rows
1094 top_row = TERM_OFFSET_top_row 1096 top_row = TERM_OFFSET_top_row
1095 CODE: 1097 CODE:
1096 RETVAL = *(int *)((char *)THIS + ix); 1098 RETVAL = *(int *)((char *)THIS + ix);
1097 OUTPUT: 1099 OUTPUT:
1098 RETVAL 1100 RETVAL
1099 1101
… …
1110 { 1112 {
1111 case 0: RETVAL = THIS->ModLevel3Mask; break; 1113 case 0: RETVAL = THIS->ModLevel3Mask; break;
1112 case 1: RETVAL = THIS->ModMetaMask; break; 1114 case 1: RETVAL = THIS->ModMetaMask; break;
1113 case 2: RETVAL = THIS->ModNumLockMask; break; 1115 case 2: RETVAL = THIS->ModNumLockMask; break;
1114 case 3: RETVAL = THIS->current_screen; break; 1116 case 3: RETVAL = THIS->current_screen; break;
1117#ifdef CURSOR_BLINK
1115 case 4: RETVAL = THIS->hidden_cursor; break; 1118 case 4: RETVAL = THIS->hidden_cursor; break;
1119#endif
1116 } 1120 }
1117 OUTPUT: 1121 OUTPUT:
1118 RETVAL 1122 RETVAL
1119 1123
1120char * 1124char *
… …
1145 if (*i) 1149 if (*i)
1146 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1150 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1147} 1151}
1148 1152
1149int 1153int
1150rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1154rxvt_term::pty_ev_events (int events = ev::UNDEF)
1151 CODE: 1155 CODE:
1152 RETVAL = THIS->pty_ev.events; 1156 RETVAL = THIS->pty_ev.events;
1153 if (events != EVENT_UNDEF) 1157 if (events != ev::UNDEF)
1154 THIS->pty_ev.set (events); 1158 THIS->pty_ev.set (events);
1155 OUTPUT: 1159 OUTPUT:
1156 RETVAL 1160 RETVAL
1157 1161
1158int 1162int
… …
1237 1241
1238void 1242void
1239rxvt_term::want_refresh () 1243rxvt_term::want_refresh ()
1240 CODE: 1244 CODE:
1241 THIS->want_refresh = 1; 1245 THIS->want_refresh = 1;
1246 THIS->refresh_check ();
1242 1247
1243void 1248void
1244rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1249rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1245 PPCODE: 1250 PPCODE:
1246{ 1251{
… …
1401SV * 1406SV *
1402rxvt_term::special_decode (SV *text) 1407rxvt_term::special_decode (SV *text)
1403 CODE: 1408 CODE:
1404{ 1409{
1405 wchar_t *wstr = sv2wcs (text); 1410 wchar_t *wstr = sv2wcs (text);
1406 int wlen = wcslen (wstr);
1407 int dlen = 0; 1411 int dlen = 0;
1408 1412
1409 // find length 1413 // find length
1410 for (wchar_t *s = wstr; *s; s++) 1414 for (wchar_t *s = wstr; *s; s++)
1411 if (*s == NOCHAR) 1415 if (*s == NOCHAR)
… …
1442# include "rsinc.h" 1446# include "rsinc.h"
1443# undef def 1447# undef def
1444# undef reserve 1448# undef reserve
1445 }; 1449 };
1446 1450
1447 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1451 rs = rslist + ARRAY_LENGTH(rslist);
1448 1452
1453 if (*name)
1449 do { 1454 {
1455 do {
1450 if (rs-- == rslist) 1456 if (rs-- == rslist)
1451 croak ("no such resource '%s', requested", name); 1457 croak ("no such resource '%s', requested", name);
1452 } while (strcmp (name, rs->name)); 1458 } while (strcmp (name, rs->name));
1453 1459
1454 index += rs->value; 1460 index += rs->value;
1461 }
1462 else
1463 {
1464 --rs;
1465 name = "";
1466 }
1455 1467
1456 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1468 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1457 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1469 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1458 1470
1459 if (GIMME_V != G_VOID) 1471 if (GIMME_V != G_VOID)
… …
1474 1486
1475const char * 1487const char *
1476rxvt_term::x_resource (const char *name) 1488rxvt_term::x_resource (const char *name)
1477 1489
1478bool 1490bool
1479rxvt_term::option (U32 optval, int set = -1) 1491rxvt_term::option (U8 optval, int set = -1)
1480 CODE: 1492 CODE:
1481{ 1493{
1482 RETVAL = THIS->options & optval; 1494 RETVAL = THIS->option (optval);
1483 1495
1484 if (set >= 0) 1496 if (set >= 0)
1485 { 1497 {
1486 if (set)
1487 THIS->options |= optval; 1498 THIS->set_option (optval, set);
1488 else
1489 THIS->options &= ~optval;
1490 1499
1491 if (THIS->check_ev.is_active ()) // avoid doing this before START 1500 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1492 switch (optval) 1501 switch (optval)
1493 { 1502 {
1494 case Opt_skipBuiltinGlyphs: 1503 case Opt_skipBuiltinGlyphs:
1495 THIS->set_fonts (); 1504 THIS->set_fonts ();
1496 THIS->scr_remap_chars (); 1505 THIS->scr_remap_chars ();
1497 THIS->scr_touch (true); 1506 THIS->scr_touch (true);
1498 THIS->want_refresh = 1; 1507 THIS->want_refresh = 1;
1508 THIS->refresh_check ();
1499 break; 1509 break;
1500 1510
1501 case Opt_cursorUnderline: 1511 case Opt_cursorUnderline:
1502 THIS->want_refresh = 1; 1512 THIS->want_refresh = 1;
1513 THIS->refresh_check ();
1503 break; 1514 break;
1504 1515
1505# case Opt_scrollBar_floating: 1516# case Opt_scrollBar_floating:
1506# case Opt_scrollBar_right: 1517# case Opt_scrollBar_right:
1507# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1518# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1540 EXTEND (SP, 2); 1551 EXTEND (SP, 2);
1541 PUSHs (sv_2mortal (newSViv (rc.row))); 1552 PUSHs (sv_2mortal (newSViv (rc.row)));
1542 PUSHs (sv_2mortal (newSViv (rc.col))); 1553 PUSHs (sv_2mortal (newSViv (rc.col)));
1543 } 1554 }
1544 1555
1545 if (items == 3) 1556 if (items >= 3)
1546 { 1557 {
1547 rc.row = SvIV (ST (1)); 1558 rc.row = SvIV (ST (1));
1548 rc.col = SvIV (ST (2)); 1559 rc.col = SvIV (ST (2));
1549 1560
1550 if (ix == 2) 1561 if (ix == 2)
… …
1565 1576
1566 clamp_it (rc.col, 0, THIS->ncol); 1577 clamp_it (rc.col, 0, THIS->ncol);
1567 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1578 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1568 1579
1569 if (ix) 1580 if (ix)
1581 {
1582 THIS->selection.screen = THIS->current_screen;
1583
1570 THIS->want_refresh = 1; 1584 THIS->want_refresh = 1;
1585 THIS->refresh_check ();
1571 } 1586 }
1587 }
1572} 1588}
1573 1589
1574char 1590int
1575rxvt_term::cur_charset () 1591rxvt_term::selection_screen (int screen = -1)
1576 CODE: 1592 CODE:
1577 RETVAL = THIS->charsets [THIS->screen.charset]; 1593 RETVAL = THIS->selection.screen;
1578 OUTPUT: 1594 if (screen >= 0)
1595 THIS->selection.screen = screen;
1596 OUTPUT:
1579 RETVAL 1597 RETVAL
1580 1598
1581void 1599void
1582rxvt_term::selection_clear () 1600rxvt_term::selection_clear (bool clipboard = false)
1583 1601
1584void 1602void
1585rxvt_term::selection_make (Time eventtime, bool rect = false) 1603rxvt_term::selection_make (Time eventtime, bool rect = false)
1586 CODE: 1604 CODE:
1587 THIS->selection.op = SELECTION_CONT; 1605 THIS->selection.op = SELECTION_CONT;
1588 THIS->selection.rect = rect; 1606 THIS->selection.rect = rect;
1589 THIS->selection_make (eventtime); 1607 THIS->selection_make (eventtime);
1590 1608
1591int 1609int
1592rxvt_term::selection_grab (Time eventtime) 1610rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1593 1611
1594void 1612void
1595rxvt_term::selection (SV *newtext = 0) 1613rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1596 PPCODE: 1614 PPCODE:
1597{ 1615{
1616 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1617 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1618
1598 if (GIMME_V != G_VOID) 1619 if (GIMME_V != G_VOID)
1599 XPUSHs (THIS->selection.text 1620 XPUSHs (text
1600 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1621 ? sv_2mortal (wcs2sv (text, len))
1601 : &PL_sv_undef); 1622 : &PL_sv_undef);
1602 1623
1603 if (newtext) 1624 if (newtext)
1604 { 1625 {
1605 free (THIS->selection.text); 1626 free (text);
1606 1627
1607 THIS->selection.text = sv2wcs (newtext); 1628 text = sv2wcs (newtext);
1608 THIS->selection.len = wcslen (THIS->selection.text); 1629 len = wcslen (text);
1609 } 1630 }
1610} 1631}
1632
1633char
1634rxvt_term::cur_charset ()
1635 CODE:
1636 RETVAL = THIS->charsets [THIS->screen.charset];
1637 OUTPUT:
1638 RETVAL
1611 1639
1612void 1640void
1613rxvt_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) 1641rxvt_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)
1614 1642
1615void 1643void
… …
1637 char *str = SvPVbyte (octets, len); 1665 char *str = SvPVbyte (octets, len);
1638 C_ARGS: 1666 C_ARGS:
1639 str, len 1667 str, len
1640 1668
1641void 1669void
1670rxvt_term::tt_paste (SV *octets)
1671 INIT:
1672 STRLEN len;
1673 char *str = SvPVbyte (octets, len);
1674 C_ARGS:
1675 str, len
1676
1677void
1642rxvt_term::cmd_parse (SV *octets) 1678rxvt_term::cmd_parse (SV *octets)
1643 CODE: 1679 CODE:
1644{ 1680{
1645 STRLEN len; 1681 STRLEN len;
1646 char *str = SvPVbyte (octets, len); 1682 char *str = SvPVbyte (octets, len);
… …
1682 Atom *props = XListProperties (THIS->dpy, window, &count); 1718 Atom *props = XListProperties (THIS->dpy, window, &count);
1683 1719
1684 EXTEND (SP, count); 1720 EXTEND (SP, count);
1685 while (count--) 1721 while (count--)
1686 PUSHs (newSVuv ((U32)props [count])); 1722 PUSHs (newSVuv ((U32)props [count]));
1687 1723
1688 XFree (props); 1724 XFree (props);
1689} 1725}
1690 1726
1691void 1727void
1692rxvt_term::XGetWindowProperty (Window window, Atom property) 1728rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1715 XFree (prop); 1751 XFree (prop);
1716 } 1752 }
1717} 1753}
1718 1754
1719void 1755void
1720rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1756rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1721 CODE: 1757 CODE:
1722{ 1758{
1723 STRLEN len; 1759 STRLEN len;
1724 char *data_ = SvPVbyte (data, len); 1760 char *data_ = SvPVbyte (data, len);
1725 1761

Diff Legend

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