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.109 by root, Thu Dec 14 15:19:31 2006 UTC vs.
Revision 1.137 by root, Mon Feb 21 07:41:03 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,2011 Marc Lehmann <schmorp@schmorp.de>
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)]
54 50
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 51/////////////////////////////////////////////////////////////////////////////
58 52
59static wchar_t * 53static wchar_t *
60sv2wcs (SV *sv) 54sv2wcs (SV *sv)
61{ 55{
… …
75 69
76 return sv; 70 return sv;
77} 71}
78 72
79static SV * 73static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85static SV *
86newSVptr (void *ptr, const char *klass) 74newSVptr (void *ptr, const char *klass)
87{ 75{
88 HV *hv = newHV (); 76 HV *hv = newHV ();
89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 77 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
90 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 78 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
119 107
120///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
121 109
122#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
123 111
124class overlay { 112class overlay : overlay_base
113{
125 rxvt_term *THIS; 114 rxvt_term *THIS;
126 AV *overlay_av; 115 AV *overlay_av;
127 int x, y, w, h;
128 int border; 116 int border;
129 text_t **text;
130 rend_t **rend;
131 117
132public: 118public:
133 HV *self; 119 HV *self;
134 120
135 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);
… …
142 128
143 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
144}; 130};
145 131
146overlay::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)
147: 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)
148{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
149 if (w < 0) w = 0; 140 if (w < 0) w = 0;
150 if (h < 0) h = 0; 141 if (h < 0) h = 0;
151 142
152 if (border == 2) 143 if (border == 2)
153 { 144 {
… …
222 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
223 )); 214 ));
224 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
225 216
226 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
227} 219}
228 220
229void 221void
230overlay::hide () 222overlay::hide ()
231{ 223{
… …
245 237
246 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
247 overlay_av = 0; 239 overlay_av = 0;
248 240
249 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
250} 243}
251 244
252void overlay::swap () 245void overlay::swap ()
253{ 246{
254 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));
255 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));
256 249
257 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
258 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;
259 257
260 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
261 { 259 {
262 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
263 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
299 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
300 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
301 } 299 }
302 300
303 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
304} 303}
305 304
306///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
307 306
308#define IOM_CLASS "urxvt"
309#include <iom_perl.h> 307#include "iom_perl.h"
310 308
311///////////////////////////////////////////////////////////////////////////// 309/////////////////////////////////////////////////////////////////////////////
312 310
313struct rxvt_perl_interp rxvt_perl; 311struct rxvt_perl_interp rxvt_perl;
314 312
… …
318{ 316{
319 if (perl) 317 if (perl)
320 { 318 {
321 perl_destruct (perl); 319 perl_destruct (perl);
322 perl_free (perl); 320 perl_free (perl);
321 PERL_SYS_TERM ();
323 } 322 }
324} 323}
325 324
326void 325void
327rxvt_perl_interp::init (rxvt_term *term) 326rxvt_perl_interp::init (rxvt_term *term)
328{ 327{
329 if (!perl) 328 if (!perl)
330 { 329 {
331 rxvt_push_locale (""); // perl init destroys current locale 330 rxvt_push_locale (""); // perl init destroys current locale
332 331
332 {
333 perl_environ = rxvt_environ; 333 perl_environ = rxvt_environ;
334 swap (perl_environ, environ); 334 localise_env set_environ (perl_environ);
335 335
336 char *argv[] = { 336 char *args[] = {
337 "", 337 "",
338 "-e" 338 "-e"
339 "BEGIN {" 339 "BEGIN {"
340 " urxvt->bootstrap;" 340 " urxvt->bootstrap;"
341 " unshift @INC, '" LIBDIR "';" 341 " unshift @INC, '" LIBDIR "';"
342 "}" 342 "}"
343 "" 343 ""
344 "use urxvt;" 344 "use urxvt;"
345 }; 345 };
346 int argc = ARRAY_LENGTH(args);
347 char **argv = args;
346 348
349 PERL_SYS_INIT3 (&argc, &argv, &environ);
347 perl = perl_alloc (); 350 perl = perl_alloc ();
348 perl_construct (perl); 351 perl_construct (perl);
349 352
350 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 353 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
351 || perl_run (perl)) 354 || perl_run (perl))
352 { 355 {
353 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 356 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
354 357
355 perl_destruct (perl); 358 perl_destruct (perl);
356 perl_free (perl); 359 perl_free (perl);
357 perl = 0; 360 perl = 0;
358 } 361 }
359 362 }
360 swap (perl_environ, environ);
361 363
362 rxvt_pop_locale (); 364 rxvt_pop_locale ();
363 } 365 }
364 366
365 if (perl) 367 if (perl)
… …
385rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 387rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
386{ 388{
387 if (!perl || !term->perl.self) 389 if (!perl || !term->perl.self)
388 return false; 390 return false;
389 391
392 localise_env set_environ (perl_environ);
393
390 // pre-handling of some events 394 // pre-handling of some events
391 if (htype == HOOK_REFRESH_END) 395 if (htype == HOOK_REFRESH_END)
392 { 396 {
393 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));
394 398
395 for (int i = 0; i <= AvFILL (av); i++) 399 for (int i = 0; i <= AvFILL (av); i++)
396 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 400 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
397 } 401 }
398 402
399 swap (perl_environ, environ);
400
401 bool event_consumed; 403 bool event_consumed;
402 404
403 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 405 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
404 || term->perl.should_invoke [htype]) 406 || term->perl.should_invoke [htype])
405 try
406 { 407 {
407 dSP; 408 dSP;
408 va_list ap; 409 va_list ap;
409 410
410 va_start (ap, htype); 411 va_start (ap, htype);
411 412
412 ENTER; 413 ENTER;
413 SAVETMPS; 414 SAVETMPS;
414 415
415 PUSHMARK (SP); 416 PUSHMARK (SP);
416 417
417 XPUSHs (sv_2mortal (newSVterm (term))); 418 XPUSHs (sv_2mortal (newSVterm (term)));
418 XPUSHs (sv_2mortal (newSViv (htype))); 419 XPUSHs (sv_2mortal (newSViv (htype)));
419 420
420 for (;;) { 421 for (;;) {
421 data_type dt = (data_type)va_arg (ap, int); 422 data_type dt = (data_type)va_arg (ap, int);
422 423
423 switch (dt) 424 switch (dt)
424 { 425 {
425 case DT_INT: 426 case DT_INT:
426 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 427 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
427 break; 428 break;
428 429
429 case DT_LONG: 430 case DT_LONG:
430 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 431 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
431 break; 432 break;
432 433
433 case DT_STR: 434 case DT_STR:
434 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 435 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
435 break; 436 break;
436 437
437 case DT_STR_LEN: 438 case DT_STR_LEN:
438 { 439 {
439 char *str = va_arg (ap, char *); 440 char *str = va_arg (ap, char *);
440 int len = va_arg (ap, int); 441 int len = va_arg (ap, int);
441 442
442 XPUSHs (sv_2mortal (newSVpvn (str, len))); 443 XPUSHs (sv_2mortal (newSVpvn (str, len)));
443 } 444 }
444 break; 445 break;
445 446
446 case DT_WCS_LEN: 447 case DT_WCS_LEN:
447 { 448 {
448 wchar_t *wstr = va_arg (ap, wchar_t *); 449 wchar_t *wstr = va_arg (ap, wchar_t *);
449 int wlen = va_arg (ap, int); 450 int wlen = va_arg (ap, int);
450 451
451 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 452 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
452 } 453 }
453 break; 454 break;
454 455
455 case DT_LCS_LEN: 456 case DT_LCS_LEN:
456 { 457 {
457 long *lstr = va_arg (ap, long *); 458 long *lstr = va_arg (ap, long *);
458 int llen = va_arg (ap, int); 459 int llen = va_arg (ap, int);
459 460
460 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 461 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
461 } 462 }
462 break; 463 break;
463 464
464 case DT_XEVENT: 465 case DT_XEVENT:
465 { 466 {
466 XEvent *xe = va_arg (ap, XEvent *); 467 XEvent *xe = va_arg (ap, XEvent *);
467 HV *hv = newHV (); 468 HV *hv = newHV ();
468 469
469# 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)
470# 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)
471# 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)
472# undef set 473# undef set
473 474
474 setiv (type, xe->type); 475 setiv (type, xe->type);
475 setiv (send_event, xe->xany.send_event); 476 setiv (send_event, xe->xany.send_event);
476 setiv (serial, xe->xany.serial); 477 setiv (serial, xe->xany.serial);
477 478
478 switch (xe->type) 479 switch (xe->type)
479 { 480 {
480 case KeyPress: 481 case KeyPress:
481 case KeyRelease: 482 case KeyRelease:
482 case ButtonPress: 483 case ButtonPress:
483 case ButtonRelease: 484 case ButtonRelease:
484 case MotionNotify: 485 case MotionNotify:
485 setuv (window, xe->xmotion.window); 486 setuv (window, xe->xmotion.window);
486 setuv (root, xe->xmotion.root); 487 setuv (root, xe->xmotion.root);
487 setuv (subwindow, xe->xmotion.subwindow); 488 setuv (subwindow, xe->xmotion.subwindow);
488 setuv (time, xe->xmotion.time); 489 setuv (time, xe->xmotion.time);
489 setiv (x, xe->xmotion.x); 490 setiv (x, xe->xmotion.x);
490 setiv (y, xe->xmotion.y); 491 setiv (y, xe->xmotion.y);
491 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 492 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
492 setiv (col, xe->xmotion.x / term->fwidth); 493 setiv (col, xe->xmotion.x / term->fwidth);
493 setiv (x_root, xe->xmotion.x_root); 494 setiv (x_root, xe->xmotion.x_root);
494 setiv (y_root, xe->xmotion.y_root); 495 setiv (y_root, xe->xmotion.y_root);
495 setuv (state, xe->xmotion.state); 496 setuv (state, xe->xmotion.state);
496 497
497 switch (xe->type) 498 switch (xe->type)
498 { 499 {
499 case KeyPress: 500 case KeyPress:
500 case KeyRelease: 501 case KeyRelease:
501 setuv (keycode, xe->xkey.keycode); 502 setuv (keycode, xe->xkey.keycode);
502 break; 503 break;
503 504
504 case ButtonPress: 505 case ButtonPress:
505 case ButtonRelease: 506 case ButtonRelease:
506 setuv (button, xe->xbutton.button); 507 setuv (button, xe->xbutton.button);
507 break; 508 break;
508 509
509 case MotionNotify: 510 case MotionNotify:
510 setiv (is_hint, xe->xmotion.is_hint); 511 setiv (is_hint, xe->xmotion.is_hint);
511 break; 512 break;
512 } 513 }
513 514
514 break; 515 break;
515 516
516 case MapNotify: 517 case MapNotify:
517 case UnmapNotify: 518 case UnmapNotify:
518 case ConfigureNotify: 519 case ConfigureNotify:
519 setuv (event, xe->xconfigure.event); 520 setuv (event, xe->xconfigure.event);
520 setuv (window, xe->xconfigure.window); 521 setuv (window, xe->xconfigure.window);
521 522
522 switch (xe->type) 523 switch (xe->type)
523 { 524 {
524 case ConfigureNotify: 525 case ConfigureNotify:
525 setiv (x, xe->xconfigure.x); 526 setiv (x, xe->xconfigure.x);
526 setiv (y, xe->xconfigure.y); 527 setiv (y, xe->xconfigure.y);
527 setiv (width, xe->xconfigure.width); 528 setiv (width, xe->xconfigure.width);
528 setiv (height, xe->xconfigure.height); 529 setiv (height, xe->xconfigure.height);
529 setuv (above, xe->xconfigure.above); 530 setuv (above, xe->xconfigure.above);
530 break; 531 break;
531 } 532 }
532 533
533 break; 534 break;
534 535
535 case PropertyNotify: 536 case PropertyNotify:
536 setuv (window, xe->xproperty.window); 537 setuv (window, xe->xproperty.window);
537 setuv (atom, xe->xproperty.atom); 538 setuv (atom, xe->xproperty.atom);
538 setuv (time, xe->xproperty.time); 539 setuv (time, xe->xproperty.time);
539 setiv (state, xe->xproperty.state); 540 setiv (state, xe->xproperty.state);
540 break; 541 break;
541 542
542 case ClientMessage: 543 case ClientMessage:
543 setuv (window, xe->xclient.window); 544 setuv (window, xe->xclient.window);
544 setuv (message_type, xe->xclient.message_type); 545 setuv (message_type, xe->xclient.message_type);
545 setuv (format, xe->xclient.format); 546 setuv (format, xe->xclient.format);
546 setuv (l0, xe->xclient.data.l[0]); 547 setuv (l0, xe->xclient.data.l[0]);
547 setuv (l1, xe->xclient.data.l[1]); 548 setuv (l1, xe->xclient.data.l[1]);
548 setuv (l2, xe->xclient.data.l[2]); 549 setuv (l2, xe->xclient.data.l[2]);
549 setuv (l3, xe->xclient.data.l[3]); 550 setuv (l3, xe->xclient.data.l[3]);
550 setuv (l4, xe->xclient.data.l[4]); 551 setuv (l4, xe->xclient.data.l[4]);
551 break; 552 break;
552 } 553 }
553 554
554 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
555 } 556 }
556 break; 557 break;
557 558
558 case DT_END: 559 case DT_END:
559 goto call; 560 goto call;
560 561
561 default: 562 default:
562 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 563 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
563 } 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);
564 } 578 }
565 579
566 call:
567 va_end (ap);
568
569 PUTBACK; 580 PUTBACK;
570 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
571 SPAGAIN;
572
573 if (count)
574 {
575 SV *status = POPs;
576 count = SvTRUE (status);
577 }
578
579 PUTBACK;
580 FREETMPS; 581 FREETMPS;
581 LEAVE; 582 LEAVE;
582 583
583 if (SvTRUE (ERRSV)) 584 if (SvTRUE (ERRSV))
584 { 585 {
585 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));
586 ungrab (term); // better lose the grab than the session 587 ungrab (term); // better lose the grab than the session
587 } 588 }
588 589
589 event_consumed = !!count; 590 event_consumed = !!count;
590 } 591 }
591 catch (...)
592 {
593 swap (perl_environ, environ);
594 throw;
595 }
596 else 592 else
597 event_consumed = false; 593 event_consumed = false;
598 594
599 // post-handling of some events 595 // post-handling of some events
600 if (htype == HOOK_REFRESH_BEGIN) 596 if (htype == HOOK_REFRESH_BEGIN)
601 { 597 {
602 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));
603 599
604 for (int i = AvFILL (av); i >= 0; i--) 600 for (int i = AvFILL (av); i >= 0; i--)
605 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 601 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
606 } 602 }
607 else if (htype == HOOK_DESTROY) 603 else if (htype == HOOK_DESTROY)
608 { 604 {
609 clearSVptr ((SV *)term->perl.self); 605 clearSVptr ((SV *)term->perl.self);
610 SvREFCNT_dec ((SV *)term->perl.self); 606 SvREFCNT_dec ((SV *)term->perl.self);
611 607
612 // don't allow further calls 608 // don't allow further calls
613 term->perl.self = 0; 609 term->perl.self = 0;
614 } 610 }
615
616 swap (perl_environ, environ);
617 611
618 return event_consumed; 612 return event_consumed;
619} 613}
620 614
621///////////////////////////////////////////////////////////////////////////// 615/////////////////////////////////////////////////////////////////////////////
… …
635# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 629# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
636# include "hookinc.h" 630# include "hookinc.h"
637# undef def 631# undef def
638 632
639 HV *option = get_hv ("urxvt::OPTION", 1); 633 HV *option = get_hv ("urxvt::OPTION", 1);
640# 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);
641# define nodef(name) 635# define nodef(name)
642# include "optinc.h" 636# include "optinc.h"
643# undef nodef 637# undef nodef
644# undef def 638# undef def
645 639
… …
647 static const struct { 641 static const struct {
648 const char *name; 642 const char *name;
649 IV iv; 643 IV iv;
650 } *civ, const_iv[] = { 644 } *civ, const_iv[] = {
651# define const_iv(name) { # name, (IV)name } 645# define const_iv(name) { # name, (IV)name }
646 const_iv (NUM_RESOURCES),
652 const_iv (DEFAULT_RSTYLE), 647 const_iv (DEFAULT_RSTYLE),
653 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),
654 const_iv (RS_Bold), 660 const_iv (RS_Bold),
655 const_iv (RS_Italic), 661 const_iv (RS_Italic),
656 const_iv (RS_Blink), 662 const_iv (RS_Blink),
657 const_iv (RS_RVid), 663 const_iv (RS_RVid),
658 const_iv (RS_Uline), 664 const_iv (RS_Uline),
… …
674 const_iv (AnyModifier), 680 const_iv (AnyModifier),
675 681
676 const_iv (NoSymbol), 682 const_iv (NoSymbol),
677 const_iv (GrabModeSync), 683 const_iv (GrabModeSync),
678 const_iv (GrabModeAsync), 684 const_iv (GrabModeAsync),
679
680 const_iv (EVENT_NONE),
681 const_iv (EVENT_READ),
682 const_iv (EVENT_WRITE),
683 685
684 const_iv (NoEventMask), 686 const_iv (NoEventMask),
685 const_iv (KeyPressMask), 687 const_iv (KeyPressMask),
686 const_iv (KeyReleaseMask), 688 const_iv (KeyReleaseMask),
687 const_iv (ButtonPressMask), 689 const_iv (ButtonPressMask),
… …
766 const_iv (XIMDontChange), 768 const_iv (XIMDontChange),
767# endif 769# endif
768# endif 770# endif
769 }; 771 };
770 772
771 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; )
772 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 774 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
773} 775}
774 776
775void 777void
776warn (const char *msg) 778warn (const char *msg)
… …
786_exit (int status) 788_exit (int status)
787 789
788NV 790NV
789NOW () 791NOW ()
790 CODE: 792 CODE:
791 RETVAL = NOW; 793 RETVAL = ev::now ();
792 OUTPUT: 794 OUTPUT:
793 RETVAL 795 RETVAL
794 796
795int 797int
796GET_BASEFG (int rend) 798GET_BASEFG (int rend)
… …
868 for (int i = AvFILL (env) + 1; i--; ) 870 for (int i = AvFILL (env) + 1; i--; )
869 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 871 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
870 872
871 envv->push_back (0); 873 envv->push_back (0);
872 874
873 bool success;
874
875 try 875 try
876 { 876 {
877 success = term->init (argv, envv); 877 term->init (argv, envv);
878 } 878 }
879 catch (const class rxvt_failure_exception &e) 879 catch (const class rxvt_failure_exception &e)
880 {
881 success = false;
882 }
883
884 if (!success)
885 { 880 {
886 term->destroy (); 881 term->destroy ();
887 croak ("error while initializing new terminal instance"); 882 croak ("error while initializing new terminal instance");
888 } 883 }
889 884
… …
1061 OUTPUT: 1056 OUTPUT:
1062 RETVAL 1057 RETVAL
1063 1058
1064#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1059#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1065 1060
1066#define TERM_OFFSET_width TERM_OFFSET(width) 1061#define TERM_OFFSET_width TERM_OFFSET(width)
1067#define TERM_OFFSET_height TERM_OFFSET(height) 1062#define TERM_OFFSET_height TERM_OFFSET(height)
1068#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1063#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1069#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1064#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1070#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1065#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1071#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1066#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1072#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1067#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1073#define TERM_OFFSET_focus TERM_OFFSET(focus) 1068#define TERM_OFFSET_focus TERM_OFFSET(focus)
1074#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1069#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1075#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1070#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1076#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1071#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1077#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1072#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1073#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1078#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1074#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1079#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1075#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1080#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1076#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1081 1077
1082int 1078int
1083rxvt_term::width () 1079rxvt_term::width ()
1084 ALIAS: 1080 ALIAS:
1085 width = TERM_OFFSET_width 1081 width = TERM_OFFSET_width
1086 height = TERM_OFFSET_height 1082 height = TERM_OFFSET_height
1087 fwidth = TERM_OFFSET_fwidth 1083 fwidth = TERM_OFFSET_fwidth
1088 fheight = TERM_OFFSET_fheight 1084 fheight = TERM_OFFSET_fheight
1089 fbase = TERM_OFFSET_fbase 1085 fbase = TERM_OFFSET_fbase
1090 nrow = TERM_OFFSET_nrow 1086 nrow = TERM_OFFSET_nrow
1091 ncol = TERM_OFFSET_ncol 1087 ncol = TERM_OFFSET_ncol
1092 focus = TERM_OFFSET_focus 1088 focus = TERM_OFFSET_focus
1093 mapped = TERM_OFFSET_mapped 1089 mapped = TERM_OFFSET_mapped
1094 int_bwidth = TERM_OFFSET_int_bwidth 1090 int_bwidth = TERM_OFFSET_int_bwidth
1095 ext_bwidth = TERM_OFFSET_ext_bwidth 1091 ext_bwidth = TERM_OFFSET_ext_bwidth
1096 lineSpace = TERM_OFFSET_lineSpace 1092 lineSpace = TERM_OFFSET_lineSpace
1093 letterSpace = TERM_OFFSET_letterSpace
1097 saveLines = TERM_OFFSET_saveLines 1094 saveLines = TERM_OFFSET_saveLines
1098 total_rows = TERM_OFFSET_total_rows 1095 total_rows = TERM_OFFSET_total_rows
1099 top_row = TERM_OFFSET_top_row 1096 top_row = TERM_OFFSET_top_row
1100 CODE: 1097 CODE:
1101 RETVAL = *(int *)((char *)THIS + ix); 1098 RETVAL = *(int *)((char *)THIS + ix);
1102 OUTPUT: 1099 OUTPUT:
1103 RETVAL 1100 RETVAL
1104 1101
… …
1115 { 1112 {
1116 case 0: RETVAL = THIS->ModLevel3Mask; break; 1113 case 0: RETVAL = THIS->ModLevel3Mask; break;
1117 case 1: RETVAL = THIS->ModMetaMask; break; 1114 case 1: RETVAL = THIS->ModMetaMask; break;
1118 case 2: RETVAL = THIS->ModNumLockMask; break; 1115 case 2: RETVAL = THIS->ModNumLockMask; break;
1119 case 3: RETVAL = THIS->current_screen; break; 1116 case 3: RETVAL = THIS->current_screen; break;
1117#ifdef CURSOR_BLINK
1120 case 4: RETVAL = THIS->hidden_cursor; break; 1118 case 4: RETVAL = THIS->hidden_cursor; break;
1119#endif
1121 } 1120 }
1122 OUTPUT: 1121 OUTPUT:
1123 RETVAL 1122 RETVAL
1124 1123
1125char * 1124char *
… …
1150 if (*i) 1149 if (*i)
1151 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1150 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1152} 1151}
1153 1152
1154int 1153int
1155rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1154rxvt_term::pty_ev_events (int events = ev::UNDEF)
1156 CODE: 1155 CODE:
1157 RETVAL = THIS->pty_ev.events; 1156 RETVAL = THIS->pty_ev.events;
1158 if (events != EVENT_UNDEF) 1157 if (events != ev::UNDEF)
1159 THIS->pty_ev.set (events); 1158 THIS->pty_ev.set (events);
1160 OUTPUT: 1159 OUTPUT:
1161 RETVAL 1160 RETVAL
1162 1161
1163int 1162int
… …
1242 1241
1243void 1242void
1244rxvt_term::want_refresh () 1243rxvt_term::want_refresh ()
1245 CODE: 1244 CODE:
1246 THIS->want_refresh = 1; 1245 THIS->want_refresh = 1;
1246 THIS->refresh_check ();
1247 1247
1248void 1248void
1249rxvt_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)
1250 PPCODE: 1250 PPCODE:
1251{ 1251{
… …
1406SV * 1406SV *
1407rxvt_term::special_decode (SV *text) 1407rxvt_term::special_decode (SV *text)
1408 CODE: 1408 CODE:
1409{ 1409{
1410 wchar_t *wstr = sv2wcs (text); 1410 wchar_t *wstr = sv2wcs (text);
1411 int wlen = wcslen (wstr);
1412 int dlen = 0; 1411 int dlen = 0;
1413 1412
1414 // find length 1413 // find length
1415 for (wchar_t *s = wstr; *s; s++) 1414 for (wchar_t *s = wstr; *s; s++)
1416 if (*s == NOCHAR) 1415 if (*s == NOCHAR)
… …
1447# include "rsinc.h" 1446# include "rsinc.h"
1448# undef def 1447# undef def
1449# undef reserve 1448# undef reserve
1450 }; 1449 };
1451 1450
1452 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1451 rs = rslist + ARRAY_LENGTH(rslist);
1453 1452
1453 if (*name)
1454 do { 1454 {
1455 do {
1455 if (rs-- == rslist) 1456 if (rs-- == rslist)
1456 croak ("no such resource '%s', requested", name); 1457 croak ("no such resource '%s', requested", name);
1457 } while (strcmp (name, rs->name)); 1458 } while (strcmp (name, rs->name));
1458 1459
1459 index += rs->value; 1460 index += rs->value;
1461 }
1462 else
1463 {
1464 --rs;
1465 name = "";
1466 }
1460 1467
1461 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1468 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1462 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);
1463 1470
1464 if (GIMME_V != G_VOID) 1471 if (GIMME_V != G_VOID)
… …
1479 1486
1480const char * 1487const char *
1481rxvt_term::x_resource (const char *name) 1488rxvt_term::x_resource (const char *name)
1482 1489
1483bool 1490bool
1484rxvt_term::option (U32 optval, int set = -1) 1491rxvt_term::option (U8 optval, int set = -1)
1485 CODE: 1492 CODE:
1486{ 1493{
1487 RETVAL = THIS->options & optval; 1494 RETVAL = THIS->option (optval);
1488 1495
1489 if (set >= 0) 1496 if (set >= 0)
1490 { 1497 {
1491 if (set)
1492 THIS->options |= optval; 1498 THIS->set_option (optval, set);
1493 else
1494 THIS->options &= ~optval;
1495 1499
1496 if (THIS->check_ev.is_active ()) // avoid doing this before START 1500 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1497 switch (optval) 1501 switch (optval)
1498 { 1502 {
1499 case Opt_skipBuiltinGlyphs: 1503 case Opt_skipBuiltinGlyphs:
1500 THIS->set_fonts (); 1504 THIS->set_fonts ();
1501 THIS->scr_remap_chars (); 1505 THIS->scr_remap_chars ();
1502 THIS->scr_touch (true); 1506 THIS->scr_touch (true);
1503 THIS->want_refresh = 1; 1507 THIS->want_refresh = 1;
1508 THIS->refresh_check ();
1504 break; 1509 break;
1505 1510
1506 case Opt_cursorUnderline: 1511 case Opt_cursorUnderline:
1507 THIS->want_refresh = 1; 1512 THIS->want_refresh = 1;
1513 THIS->refresh_check ();
1508 break; 1514 break;
1509 1515
1510# case Opt_scrollBar_floating: 1516# case Opt_scrollBar_floating:
1511# case Opt_scrollBar_right: 1517# case Opt_scrollBar_right:
1512# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1518# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1545 EXTEND (SP, 2); 1551 EXTEND (SP, 2);
1546 PUSHs (sv_2mortal (newSViv (rc.row))); 1552 PUSHs (sv_2mortal (newSViv (rc.row)));
1547 PUSHs (sv_2mortal (newSViv (rc.col))); 1553 PUSHs (sv_2mortal (newSViv (rc.col)));
1548 } 1554 }
1549 1555
1550 if (items == 3) 1556 if (items >= 3)
1551 { 1557 {
1552 rc.row = SvIV (ST (1)); 1558 rc.row = SvIV (ST (1));
1553 rc.col = SvIV (ST (2)); 1559 rc.col = SvIV (ST (2));
1554 1560
1555 if (ix == 2) 1561 if (ix == 2)
… …
1570 1576
1571 clamp_it (rc.col, 0, THIS->ncol); 1577 clamp_it (rc.col, 0, THIS->ncol);
1572 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1578 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1573 1579
1574 if (ix) 1580 if (ix)
1581 {
1582 THIS->selection.screen = THIS->current_screen;
1583
1575 THIS->want_refresh = 1; 1584 THIS->want_refresh = 1;
1585 THIS->refresh_check ();
1576 } 1586 }
1587 }
1577} 1588}
1578 1589
1579char 1590int
1580rxvt_term::cur_charset () 1591rxvt_term::selection_screen (int screen = -1)
1581 CODE: 1592 CODE:
1582 RETVAL = THIS->charsets [THIS->screen.charset]; 1593 RETVAL = THIS->selection.screen;
1583 OUTPUT: 1594 if (screen >= 0)
1595 THIS->selection.screen = screen;
1596 OUTPUT:
1584 RETVAL 1597 RETVAL
1585 1598
1586void 1599void
1587rxvt_term::selection_clear () 1600rxvt_term::selection_clear (bool clipboard = false)
1588 1601
1589void 1602void
1590rxvt_term::selection_make (Time eventtime, bool rect = false) 1603rxvt_term::selection_make (Time eventtime, bool rect = false)
1591 CODE: 1604 CODE:
1592 THIS->selection.op = SELECTION_CONT; 1605 THIS->selection.op = SELECTION_CONT;
1593 THIS->selection.rect = rect; 1606 THIS->selection.rect = rect;
1594 THIS->selection_make (eventtime); 1607 THIS->selection_make (eventtime);
1595 1608
1596int 1609int
1597rxvt_term::selection_grab (Time eventtime) 1610rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1598 1611
1599void 1612void
1600rxvt_term::selection (SV *newtext = 0) 1613rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1601 PPCODE: 1614 PPCODE:
1602{ 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
1603 if (GIMME_V != G_VOID) 1619 if (GIMME_V != G_VOID)
1604 XPUSHs (THIS->selection.text 1620 XPUSHs (text
1605 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1621 ? sv_2mortal (wcs2sv (text, len))
1606 : &PL_sv_undef); 1622 : &PL_sv_undef);
1607 1623
1608 if (newtext) 1624 if (newtext)
1609 { 1625 {
1610 free (THIS->selection.text); 1626 free (text);
1611 1627
1612 THIS->selection.text = sv2wcs (newtext); 1628 text = sv2wcs (newtext);
1613 THIS->selection.len = wcslen (THIS->selection.text); 1629 len = wcslen (text);
1614 } 1630 }
1615} 1631}
1632
1633char
1634rxvt_term::cur_charset ()
1635 CODE:
1636 RETVAL = THIS->charsets [THIS->screen.charset];
1637 OUTPUT:
1638 RETVAL
1616 1639
1617void 1640void
1618rxvt_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)
1619 1642
1620void 1643void
… …
1642 char *str = SvPVbyte (octets, len); 1665 char *str = SvPVbyte (octets, len);
1643 C_ARGS: 1666 C_ARGS:
1644 str, len 1667 str, len
1645 1668
1646void 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
1647rxvt_term::cmd_parse (SV *octets) 1678rxvt_term::cmd_parse (SV *octets)
1648 CODE: 1679 CODE:
1649{ 1680{
1650 STRLEN len; 1681 STRLEN len;
1651 char *str = SvPVbyte (octets, len); 1682 char *str = SvPVbyte (octets, len);
… …
1687 Atom *props = XListProperties (THIS->dpy, window, &count); 1718 Atom *props = XListProperties (THIS->dpy, window, &count);
1688 1719
1689 EXTEND (SP, count); 1720 EXTEND (SP, count);
1690 while (count--) 1721 while (count--)
1691 PUSHs (newSVuv ((U32)props [count])); 1722 PUSHs (newSVuv ((U32)props [count]));
1692 1723
1693 XFree (props); 1724 XFree (props);
1694} 1725}
1695 1726
1696void 1727void
1697rxvt_term::XGetWindowProperty (Window window, Atom property) 1728rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1720 XFree (prop); 1751 XFree (prop);
1721 } 1752 }
1722} 1753}
1723 1754
1724void 1755void
1725rxvt_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)
1726 CODE: 1757 CODE:
1727{ 1758{
1728 STRLEN len; 1759 STRLEN len;
1729 char *data_ = SvPVbyte (data, len); 1760 char *data_ = SvPVbyte (data, len);
1730 1761

Diff Legend

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