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.122 by root, Sun Jun 15 14:07:58 2008 UTC vs.
Revision 1.149 by sf-exg, Sat Jan 7 12:01:30 2012 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-2008 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.
… …
107 107
108///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
109 109
110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
111 111
112class overlay { 112class overlay : overlay_base
113{
113 rxvt_term *THIS; 114 rxvt_term *THIS;
114 AV *overlay_av; 115 AV *overlay_av;
115 int x, y, w, h;
116 int border; 116 int border;
117 text_t **text;
118 rend_t **rend;
119 117
120public: 118public:
121 HV *self; 119 HV *self;
122 120
123 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);
… …
130 128
131 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
132}; 130};
133 131
134overlay::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)
135: 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)
136{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
137 if (w < 0) w = 0; 140 if (w < 0) w = 0;
138 if (h < 0) h = 0; 141 if (h < 0) h = 0;
139 142
140 if (border == 2) 143 if (border == 2)
141 { 144 {
… …
245 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));
246 249
247 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
248 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
249 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
250 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
251 { 259 {
252 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
253 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
254 262
… …
294 THIS->refresh_check (); 302 THIS->refresh_check ();
295} 303}
296 304
297///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
298 306
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h" 307#include "iom_perl.h"
302 308
303///////////////////////////////////////////////////////////////////////////// 309/////////////////////////////////////////////////////////////////////////////
304 310
305struct rxvt_perl_interp rxvt_perl; 311struct rxvt_perl_interp rxvt_perl;
… …
310{ 316{
311 if (perl) 317 if (perl)
312 { 318 {
313 perl_destruct (perl); 319 perl_destruct (perl);
314 perl_free (perl); 320 perl_free (perl);
321 PERL_SYS_TERM ();
315 } 322 }
316} 323}
317 324
318void 325void
319rxvt_perl_interp::init (rxvt_term *term) 326rxvt_perl_interp::init (rxvt_term *term)
320{ 327{
321 if (!perl) 328 if (!perl)
322 { 329 {
323 rxvt_push_locale (""); // perl init destroys current locale 330 rxvt_push_locale (""); // perl init destroys current locale
324 331
332 {
325 perl_environ = rxvt_environ; 333 perl_environ = rxvt_environ;
326 swap (perl_environ, environ); 334 localise_env set_environ (perl_environ);
327 335
328 char *argv[] = { 336 char *args[] = {
329 "", 337 "",
330 "-e" 338 "-e"
331 "BEGIN {" 339 "BEGIN {"
332 " urxvt->bootstrap;" 340 " urxvt->bootstrap;"
333 " unshift @INC, '" LIBDIR "';" 341 " unshift @INC, '" LIBDIR "';"
334 "}" 342 "}"
335 "" 343 ""
336 "use urxvt;" 344 "use urxvt;"
337 }; 345 };
346 int argc = ecb_array_length (args);
347 char **argv = args;
338 348
349 PERL_SYS_INIT3 (&argc, &argv, &environ);
339 perl = perl_alloc (); 350 perl = perl_alloc ();
340 perl_construct (perl); 351 perl_construct (perl);
341 352
342 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 353 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
343 || perl_run (perl)) 354 || perl_run (perl))
344 { 355 {
345 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 356 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
346 357
347 perl_destruct (perl); 358 perl_destruct (perl);
348 perl_free (perl); 359 perl_free (perl);
349 perl = 0; 360 perl = 0;
350 } 361 }
351 362 }
352 swap (perl_environ, environ);
353 363
354 rxvt_pop_locale (); 364 rxvt_pop_locale ();
355 } 365 }
356 366
357 if (perl) 367 if (perl)
358 { 368 {
359 // runs outside of perls ENV 369 // runs outside of perls ENV
360 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 370 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
361 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 371 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
372 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
362 } 373 }
363} 374}
364 375
365static void 376static void
366ungrab (rxvt_term *THIS) 377ungrab (rxvt_term *THIS)
… …
377rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 388rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
378{ 389{
379 if (!perl || !term->perl.self) 390 if (!perl || !term->perl.self)
380 return false; 391 return false;
381 392
393 localise_env set_environ (perl_environ);
394
382 // pre-handling of some events 395 // pre-handling of some events
383 if (htype == HOOK_REFRESH_END) 396 if (htype == HOOK_REFRESH_END)
384 { 397 {
385 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 398 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
386 399
387 for (int i = 0; i <= AvFILL (av); i++) 400 for (int i = 0; i <= AvFILL (av); i++)
388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 401 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
389 } 402 }
403 else if (htype == HOOK_DESTROY)
404 {
405 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
390 406
391 swap (perl_environ, environ); 407 for (int i = AvFILL (av); i >= 0; i--)
408 {
409 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
410 delete req;
411 }
412 }
392 413
393 bool event_consumed; 414 bool event_consumed;
394 415
395 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 416 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
396 || term->perl.should_invoke [htype]) 417 || term->perl.should_invoke [htype])
397 try
398 { 418 {
399 dSP; 419 dSP;
400 va_list ap; 420 va_list ap;
401 421
402 va_start (ap, htype); 422 va_start (ap, htype);
403 423
404 ENTER; 424 ENTER;
405 SAVETMPS; 425 SAVETMPS;
406 426
407 PUSHMARK (SP); 427 PUSHMARK (SP);
408 428
429 EXTEND (SP, 2);
409 XPUSHs (sv_2mortal (newSVterm (term))); 430 PUSHs (sv_2mortal (newSVterm (term)));
410 XPUSHs (sv_2mortal (newSViv (htype))); 431 PUSHs (sv_2mortal (newSViv (htype)));
411 432
412 for (;;) { 433 for (;;) {
413 data_type dt = (data_type)va_arg (ap, int); 434 data_type dt = (data_type)va_arg (ap, int);
414 435
415 switch (dt) 436 switch (dt)
416 { 437 {
417 case DT_INT: 438 case DT_INT:
418 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 439 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
419 break; 440 break;
420 441
421 case DT_LONG: 442 case DT_LONG:
422 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 443 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
423 break; 444 break;
424 445
425 case DT_STR: 446 case DT_STR:
426 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 447 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
427 break; 448 break;
428 449
429 case DT_STR_LEN: 450 case DT_STR_LEN:
430 { 451 {
431 char *str = va_arg (ap, char *); 452 char *str = va_arg (ap, char *);
432 int len = va_arg (ap, int); 453 int len = va_arg (ap, int);
433 454
434 XPUSHs (sv_2mortal (newSVpvn (str, len))); 455 XPUSHs (sv_2mortal (newSVpvn (str, len)));
435 } 456 }
436 break; 457 break;
437 458
438 case DT_WCS_LEN: 459 case DT_WCS_LEN:
439 { 460 {
440 wchar_t *wstr = va_arg (ap, wchar_t *); 461 wchar_t *wstr = va_arg (ap, wchar_t *);
441 int wlen = va_arg (ap, int); 462 int wlen = va_arg (ap, int);
442 463
443 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 464 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
444 } 465 }
445 break; 466 break;
446 467
447 case DT_LCS_LEN: 468 case DT_LCS_LEN:
448 { 469 {
449 long *lstr = va_arg (ap, long *); 470 long *lstr = va_arg (ap, long *);
450 int llen = va_arg (ap, int); 471 int llen = va_arg (ap, int);
451 472
452 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 473 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
453 } 474 }
454 break; 475 break;
455 476
456 case DT_XEVENT: 477 case DT_XEVENT:
457 { 478 {
458 XEvent *xe = va_arg (ap, XEvent *); 479 XEvent *xe = va_arg (ap, XEvent *);
459 HV *hv = newHV (); 480 HV *hv = newHV ();
460 481
461# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 482# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
462# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 483# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
463# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 484# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
464# undef set 485# undef set
465 486
466 setiv (type, xe->type); 487 setiv (type, xe->type);
467 setiv (send_event, xe->xany.send_event); 488 setiv (send_event, xe->xany.send_event);
468 setiv (serial, xe->xany.serial); 489 setiv (serial, xe->xany.serial);
469 490
470 switch (xe->type) 491 switch (xe->type)
471 { 492 {
472 case KeyPress: 493 case KeyPress:
473 case KeyRelease: 494 case KeyRelease:
474 case ButtonPress: 495 case ButtonPress:
475 case ButtonRelease: 496 case ButtonRelease:
476 case MotionNotify: 497 case MotionNotify:
477 setuv (window, xe->xmotion.window); 498 setuv (window, xe->xmotion.window);
478 setuv (root, xe->xmotion.root); 499 setuv (root, xe->xmotion.root);
479 setuv (subwindow, xe->xmotion.subwindow); 500 setuv (subwindow, xe->xmotion.subwindow);
480 setuv (time, xe->xmotion.time); 501 setuv (time, xe->xmotion.time);
481 setiv (x, xe->xmotion.x); 502 setiv (x, xe->xmotion.x);
482 setiv (y, xe->xmotion.y); 503 setiv (y, xe->xmotion.y);
483 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 504 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
484 setiv (col, xe->xmotion.x / term->fwidth); 505 setiv (col, xe->xmotion.x / term->fwidth);
485 setiv (x_root, xe->xmotion.x_root); 506 setiv (x_root, xe->xmotion.x_root);
486 setiv (y_root, xe->xmotion.y_root); 507 setiv (y_root, xe->xmotion.y_root);
487 setuv (state, xe->xmotion.state); 508 setuv (state, xe->xmotion.state);
488 509
489 switch (xe->type) 510 switch (xe->type)
490 { 511 {
491 case KeyPress: 512 case KeyPress:
492 case KeyRelease: 513 case KeyRelease:
493 setuv (keycode, xe->xkey.keycode); 514 setuv (keycode, xe->xkey.keycode);
494 break; 515 break;
495 516
496 case ButtonPress: 517 case ButtonPress:
497 case ButtonRelease: 518 case ButtonRelease:
498 setuv (button, xe->xbutton.button); 519 setuv (button, xe->xbutton.button);
499 break; 520 break;
500 521
501 case MotionNotify: 522 case MotionNotify:
502 setiv (is_hint, xe->xmotion.is_hint); 523 setiv (is_hint, xe->xmotion.is_hint);
503 break; 524 break;
504 } 525 }
505 526
506 break; 527 break;
507 528
508 case MapNotify: 529 case MapNotify:
509 case UnmapNotify: 530 case UnmapNotify:
510 case ConfigureNotify: 531 case ConfigureNotify:
511 setuv (event, xe->xconfigure.event); 532 setuv (event, xe->xconfigure.event);
512 setuv (window, xe->xconfigure.window); 533 setuv (window, xe->xconfigure.window);
513 534
514 switch (xe->type) 535 switch (xe->type)
515 { 536 {
516 case ConfigureNotify: 537 case ConfigureNotify:
517 setiv (x, xe->xconfigure.x); 538 setiv (x, xe->xconfigure.x);
518 setiv (y, xe->xconfigure.y); 539 setiv (y, xe->xconfigure.y);
519 setiv (width, xe->xconfigure.width); 540 setiv (width, xe->xconfigure.width);
520 setiv (height, xe->xconfigure.height); 541 setiv (height, xe->xconfigure.height);
521 setuv (above, xe->xconfigure.above); 542 setuv (above, xe->xconfigure.above);
522 break; 543 break;
523 } 544 }
524 545
525 break; 546 break;
526 547
527 case PropertyNotify: 548 case PropertyNotify:
528 setuv (window, xe->xproperty.window); 549 setuv (window, xe->xproperty.window);
529 setuv (atom, xe->xproperty.atom); 550 setuv (atom, xe->xproperty.atom);
530 setuv (time, xe->xproperty.time); 551 setuv (time, xe->xproperty.time);
531 setiv (state, xe->xproperty.state); 552 setiv (state, xe->xproperty.state);
532 break; 553 break;
533 554
534 case ClientMessage: 555 case ClientMessage:
535 setuv (window, xe->xclient.window); 556 setuv (window, xe->xclient.window);
536 setuv (message_type, xe->xclient.message_type); 557 setuv (message_type, xe->xclient.message_type);
537 setuv (format, xe->xclient.format); 558 setuv (format, xe->xclient.format);
538 setuv (l0, xe->xclient.data.l[0]); 559 setuv (l0, xe->xclient.data.l[0]);
539 setuv (l1, xe->xclient.data.l[1]); 560 setuv (l1, xe->xclient.data.l[1]);
540 setuv (l2, xe->xclient.data.l[2]); 561 setuv (l2, xe->xclient.data.l[2]);
541 setuv (l3, xe->xclient.data.l[3]); 562 setuv (l3, xe->xclient.data.l[3]);
542 setuv (l4, xe->xclient.data.l[4]); 563 setuv (l4, xe->xclient.data.l[4]);
543 break; 564 break;
544 } 565 }
545 566
546 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 567 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
547 } 568 }
548 break; 569 break;
549 570
550 case DT_END: 571 case DT_END:
551 goto call; 572 goto call;
552 573
553 default: 574 default:
554 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 575 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
555 } 576 }
577 }
578
579 call:
580 va_end (ap);
581
582 PUTBACK;
583 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
584 SPAGAIN;
585
586 if (count)
587 {
588 SV *status = POPs;
589 count = SvTRUE (status);
556 } 590 }
557 591
558 call:
559 va_end (ap);
560
561 PUTBACK; 592 PUTBACK;
562 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
563 SPAGAIN;
564
565 if (count)
566 {
567 SV *status = POPs;
568 count = SvTRUE (status);
569 }
570
571 PUTBACK;
572 FREETMPS; 593 FREETMPS;
573 LEAVE; 594 LEAVE;
574 595
575 if (SvTRUE (ERRSV)) 596 if (SvTRUE (ERRSV))
576 { 597 {
577 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 598 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
578 ungrab (term); // better lose the grab than the session 599 ungrab (term); // better lose the grab than the session
579 } 600 }
580 601
581 event_consumed = !!count; 602 event_consumed = !!count;
582 } 603 }
583 catch (...)
584 {
585 swap (perl_environ, environ);
586 throw;
587 }
588 else 604 else
589 event_consumed = false; 605 event_consumed = false;
590 606
591 // post-handling of some events 607 // post-handling of some events
592 if (htype == HOOK_REFRESH_BEGIN) 608 if (htype == HOOK_REFRESH_BEGIN)
… …
603 619
604 // don't allow further calls 620 // don't allow further calls
605 term->perl.self = 0; 621 term->perl.self = 0;
606 } 622 }
607 623
608 swap (perl_environ, environ);
609
610 return event_consumed; 624 return event_consumed;
625}
626
627void
628rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
629{
630 localise_env set_environ (perl_environ);
631
632 ENTER;
633 SAVETMPS;
634
635 dSP;
636 XPUSHs (sv_2mortal (newSVpvn (data, len)));
637 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
638
639 if (SvTRUE (ERRSV))
640 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
641
642 FREETMPS;
643 LEAVE;
611} 644}
612 645
613///////////////////////////////////////////////////////////////////////////// 646/////////////////////////////////////////////////////////////////////////////
614 647
615MODULE = urxvt PACKAGE = urxvt 648MODULE = urxvt PACKAGE = urxvt
… …
627# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 660# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
628# include "hookinc.h" 661# include "hookinc.h"
629# undef def 662# undef def
630 663
631 HV *option = get_hv ("urxvt::OPTION", 1); 664 HV *option = get_hv ("urxvt::OPTION", 1);
632# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 665# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
633# define nodef(name) 666# define nodef(name)
634# include "optinc.h" 667# include "optinc.h"
635# undef nodef 668# undef nodef
636# undef def 669# undef def
637 670
… …
639 static const struct { 672 static const struct {
640 const char *name; 673 const char *name;
641 IV iv; 674 IV iv;
642 } *civ, const_iv[] = { 675 } *civ, const_iv[] = {
643# define const_iv(name) { # name, (IV)name } 676# define const_iv(name) { # name, (IV)name }
677 const_iv (NUM_RESOURCES),
644 const_iv (DEFAULT_RSTYLE), 678 const_iv (DEFAULT_RSTYLE),
645 const_iv (OVERLAY_RSTYLE), 679 const_iv (OVERLAY_RSTYLE),
680 const_iv (Color_Bits),
681 const_iv (RS_bgShift), const_iv (RS_bgMask),
682 const_iv (RS_fgShift), const_iv (RS_fgMask),
683 const_iv (RS_Careful),
684 const_iv (RS_fontCount),
685 const_iv (RS_fontShift),
686 const_iv (RS_fontMask),
687 const_iv (RS_baseattrMask),
688 const_iv (RS_attrMask),
689 const_iv (RS_redraw),
690 const_iv (RS_Sel),
646 const_iv (RS_Bold), 691 const_iv (RS_Bold),
647 const_iv (RS_Italic), 692 const_iv (RS_Italic),
648 const_iv (RS_Blink), 693 const_iv (RS_Blink),
649 const_iv (RS_RVid), 694 const_iv (RS_RVid),
650 const_iv (RS_Uline), 695 const_iv (RS_Uline),
… …
754 const_iv (XIMDontChange), 799 const_iv (XIMDontChange),
755# endif 800# endif
756# endif 801# endif
757 }; 802 };
758 803
759 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 804 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
760 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 805 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
761} 806}
762 807
763void 808void
764warn (const char *msg) 809warn (const char *msg)
765 CODE: 810 CODE:
… …
837 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 882 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
838 if ((*t)->perl.self) 883 if ((*t)->perl.self)
839 PUSHs (sv_2mortal (newSVterm (*t))); 884 PUSHs (sv_2mortal (newSVterm (*t)));
840} 885}
841 886
887IV
888_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
889 CODE:
890 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
891 req->cb_sv = newSVsv (cb);
892 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
893 av_push (av, newSViv ((IV)req));
894 RETVAL = (IV)req;
895 OUTPUT:
896 RETVAL
897
898void
899_delete_selection_request (IV req_)
900 CODE:
901 rxvt_selection *req = (rxvt_selection *)req_;
902 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
903 int i;
904
905 for (i = AvFILL (av); i >= 0; i--)
906 if (SvIV (*av_fetch (av, i, 1)) == req_)
907 break;
908
909 for (; i < AvFILL (av); i++)
910 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
911
912 av_pop (av);
913
914 delete req;
915
842MODULE = urxvt PACKAGE = urxvt::term 916MODULE = urxvt PACKAGE = urxvt::term
843 917
844SV * 918SV *
845_new (AV *env, AV *arg) 919_new (AV *env, AV *arg)
846 CODE: 920 CODE:
847{ 921{
848 rxvt_term *term = new rxvt_term; 922 rxvt_term *term = new rxvt_term;
849 923
850 stringvec *argv = new stringvec; 924 stringvec *argv = new stringvec;
851 stringvec *envv = new stringvec;
852
853 for (int i = 0; i <= AvFILL (arg); i++) 925 for (int i = 0; i <= AvFILL (arg); i++)
854 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 926 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
855 927
928 stringvec *envv = new stringvec;
856 for (int i = AvFILL (env) + 1; i--; ) 929 for (int i = AvFILL (env) + 1; i--; )
857 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 930 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
858
859 envv->push_back (0);
860 931
861 try 932 try
862 { 933 {
863 term->init (argv, envv); 934 term->init (argv, envv);
864 } 935 }
… …
904 975
905void 976void
906rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 977rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
907 CODE: 978 CODE:
908 XUngrabKey (THIS->dpy, keycode, modifiers, window); 979 XUngrabKey (THIS->dpy, keycode, modifiers, window);
909
910void
911rxvt_term::XUngrabKeyboard (Time eventtime)
912 CODE:
913 XUngrabKeyboard (THIS->dpy, eventtime);
914 980
915bool 981bool
916rxvt_term::grab (Time eventtime, int sync = 0) 982rxvt_term::grab (Time eventtime, int sync = 0)
917 CODE: 983 CODE:
918{ 984{
… …
1033 free (wstr); 1099 free (wstr);
1034} 1100}
1035 OUTPUT: 1101 OUTPUT:
1036 RETVAL 1102 RETVAL
1037 1103
1038char *
1039rxvt_term::locale ()
1040 CODE:
1041 RETVAL = THIS->locale;
1042 OUTPUT:
1043 RETVAL
1044
1045#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1104#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1046 1105
1047#define TERM_OFFSET_width TERM_OFFSET(width) 1106#define TERM_OFFSET_width TERM_OFFSET(width)
1048#define TERM_OFFSET_height TERM_OFFSET(height) 1107#define TERM_OFFSET_height TERM_OFFSET(height)
1049#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1108#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1050#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1109#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1051#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1110#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1052#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1111#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1053#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1112#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1054#define TERM_OFFSET_focus TERM_OFFSET(focus) 1113#define TERM_OFFSET_focus TERM_OFFSET(focus)
1055#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1114#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1056#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1115#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1057#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1116#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1058#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1117#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1118#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1059#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1119#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1060#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1120#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1061#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1121#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1062 1122
1063int 1123int
1064rxvt_term::width () 1124rxvt_term::width ()
1065 ALIAS: 1125 ALIAS:
1066 width = TERM_OFFSET_width 1126 width = TERM_OFFSET_width
1067 height = TERM_OFFSET_height 1127 height = TERM_OFFSET_height
1068 fwidth = TERM_OFFSET_fwidth 1128 fwidth = TERM_OFFSET_fwidth
1069 fheight = TERM_OFFSET_fheight 1129 fheight = TERM_OFFSET_fheight
1070 fbase = TERM_OFFSET_fbase 1130 fbase = TERM_OFFSET_fbase
1071 nrow = TERM_OFFSET_nrow 1131 nrow = TERM_OFFSET_nrow
1072 ncol = TERM_OFFSET_ncol 1132 ncol = TERM_OFFSET_ncol
1073 focus = TERM_OFFSET_focus 1133 focus = TERM_OFFSET_focus
1074 mapped = TERM_OFFSET_mapped 1134 mapped = TERM_OFFSET_mapped
1075 int_bwidth = TERM_OFFSET_int_bwidth 1135 int_bwidth = TERM_OFFSET_int_bwidth
1076 ext_bwidth = TERM_OFFSET_ext_bwidth 1136 ext_bwidth = TERM_OFFSET_ext_bwidth
1077 lineSpace = TERM_OFFSET_lineSpace 1137 lineSpace = TERM_OFFSET_lineSpace
1138 letterSpace = TERM_OFFSET_letterSpace
1078 saveLines = TERM_OFFSET_saveLines 1139 saveLines = TERM_OFFSET_saveLines
1079 total_rows = TERM_OFFSET_total_rows 1140 total_rows = TERM_OFFSET_total_rows
1080 top_row = TERM_OFFSET_top_row 1141 top_row = TERM_OFFSET_top_row
1081 CODE: 1142 CODE:
1082 RETVAL = *(int *)((char *)THIS + ix); 1143 RETVAL = *(int *)((char *)THIS + ix);
1083 OUTPUT: 1144 OUTPUT:
1084 RETVAL 1145 RETVAL
1085 1146
… …
1096 { 1157 {
1097 case 0: RETVAL = THIS->ModLevel3Mask; break; 1158 case 0: RETVAL = THIS->ModLevel3Mask; break;
1098 case 1: RETVAL = THIS->ModMetaMask; break; 1159 case 1: RETVAL = THIS->ModMetaMask; break;
1099 case 2: RETVAL = THIS->ModNumLockMask; break; 1160 case 2: RETVAL = THIS->ModNumLockMask; break;
1100 case 3: RETVAL = THIS->current_screen; break; 1161 case 3: RETVAL = THIS->current_screen; break;
1162#ifdef CURSOR_BLINK
1101 case 4: RETVAL = THIS->hidden_cursor; break; 1163 case 4: RETVAL = THIS->hidden_cursor; break;
1164#endif
1102 } 1165 }
1103 OUTPUT: 1166 OUTPUT:
1104 RETVAL 1167 RETVAL
1105 1168
1106char * 1169char *
… …
1149 RETVAL 1212 RETVAL
1150 1213
1151Window 1214Window
1152rxvt_term::parent () 1215rxvt_term::parent ()
1153 CODE: 1216 CODE:
1154 RETVAL = THIS->parent [0]; 1217 RETVAL = THIS->parent;
1155 OUTPUT: 1218 OUTPUT:
1156 RETVAL 1219 RETVAL
1157 1220
1158Window 1221Window
1159rxvt_term::vt () 1222rxvt_term::vt ()
… …
1186 if (newval <= 0) 1249 if (newval <= 0)
1187 THIS->scr_changeview (max (newval, THIS->top_row)); 1250 THIS->scr_changeview (max (newval, THIS->top_row));
1188} 1251}
1189 OUTPUT: 1252 OUTPUT:
1190 RETVAL 1253 RETVAL
1254
1255void
1256rxvt_term::set_urgency (bool enable)
1191 1257
1192void 1258void
1193rxvt_term::focus_in () 1259rxvt_term::focus_in ()
1194 1260
1195void 1261void
… …
1428# include "rsinc.h" 1494# include "rsinc.h"
1429# undef def 1495# undef def
1430# undef reserve 1496# undef reserve
1431 }; 1497 };
1432 1498
1433 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1499 rs = rslist + ecb_array_length (rslist);
1434 1500
1501 if (*name)
1435 do { 1502 {
1503 do {
1436 if (rs-- == rslist) 1504 if (rs-- == rslist)
1437 croak ("no such resource '%s', requested", name); 1505 croak ("no such resource '%s', requested", name);
1438 } while (strcmp (name, rs->name)); 1506 } while (strcmp (name, rs->name));
1439 1507
1440 index += rs->value; 1508 index += rs->value;
1509 }
1510 else
1511 {
1512 --rs;
1513 name = "";
1514 }
1441 1515
1442 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1516 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1443 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1517 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1444 1518
1445 if (GIMME_V != G_VOID) 1519 if (GIMME_V != G_VOID)
… …
1504 THIS->keyboard->register_done (); 1578 THIS->keyboard->register_done ();
1505 OUTPUT: 1579 OUTPUT:
1506 RETVAL 1580 RETVAL
1507 1581
1508void 1582void
1583rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1584 CODE:
1585 wchar_t *wstr = sv2wcs (str);
1586 THIS->keyboard->register_user_translation (keysym, state, wstr);
1587 free (wstr);
1588
1589void
1509rxvt_term::screen_cur (...) 1590rxvt_term::screen_cur (...)
1510 PROTOTYPE: $;$$ 1591 PROTOTYPE: $;$$
1511 ALIAS: 1592 ALIAS:
1512 screen_cur = 0 1593 screen_cur = 0
1513 selection_beg = 1 1594 selection_beg = 1
… …
1525 EXTEND (SP, 2); 1606 EXTEND (SP, 2);
1526 PUSHs (sv_2mortal (newSViv (rc.row))); 1607 PUSHs (sv_2mortal (newSViv (rc.row)));
1527 PUSHs (sv_2mortal (newSViv (rc.col))); 1608 PUSHs (sv_2mortal (newSViv (rc.col)));
1528 } 1609 }
1529 1610
1530 if (items == 3) 1611 if (items >= 3)
1531 { 1612 {
1532 rc.row = SvIV (ST (1)); 1613 rc.row = SvIV (ST (1));
1533 rc.col = SvIV (ST (2)); 1614 rc.col = SvIV (ST (2));
1534 1615
1535 if (ix == 2) 1616 if (ix == 2)
… …
1551 clamp_it (rc.col, 0, THIS->ncol); 1632 clamp_it (rc.col, 0, THIS->ncol);
1552 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1633 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1553 1634
1554 if (ix) 1635 if (ix)
1555 { 1636 {
1637 THIS->selection.screen = THIS->current_screen;
1638
1556 THIS->want_refresh = 1; 1639 THIS->want_refresh = 1;
1557 THIS->refresh_check (); 1640 THIS->refresh_check ();
1558 } 1641 }
1559 } 1642 }
1560} 1643}
1561 1644
1562char 1645int
1563rxvt_term::cur_charset () 1646rxvt_term::selection_screen (int screen = -1)
1564 CODE: 1647 CODE:
1565 RETVAL = THIS->charsets [THIS->screen.charset]; 1648 RETVAL = THIS->selection.screen;
1566 OUTPUT: 1649 if (screen >= 0)
1650 THIS->selection.screen = screen;
1651 OUTPUT:
1567 RETVAL 1652 RETVAL
1568 1653
1569void 1654void
1570rxvt_term::selection_clear () 1655rxvt_term::selection_clear (bool clipboard = false)
1571 1656
1572void 1657void
1573rxvt_term::selection_make (Time eventtime, bool rect = false) 1658rxvt_term::selection_make (Time eventtime, bool rect = false)
1574 CODE: 1659 CODE:
1575 THIS->selection.op = SELECTION_CONT; 1660 THIS->selection.op = SELECTION_CONT;
1576 THIS->selection.rect = rect; 1661 THIS->selection.rect = rect;
1577 THIS->selection_make (eventtime); 1662 THIS->selection_make (eventtime);
1578 1663
1579int 1664int
1580rxvt_term::selection_grab (Time eventtime) 1665rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1581 1666
1582void 1667void
1583rxvt_term::selection (SV *newtext = 0) 1668rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1584 PPCODE: 1669 PPCODE:
1585{ 1670{
1671 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1672 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1673
1586 if (GIMME_V != G_VOID) 1674 if (GIMME_V != G_VOID)
1587 XPUSHs (THIS->selection.text 1675 XPUSHs (text
1588 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1676 ? sv_2mortal (wcs2sv (text, len))
1589 : &PL_sv_undef); 1677 : &PL_sv_undef);
1590 1678
1591 if (newtext) 1679 if (newtext)
1592 { 1680 {
1593 free (THIS->selection.text); 1681 free (text);
1594 1682
1595 THIS->selection.text = sv2wcs (newtext); 1683 text = sv2wcs (newtext);
1596 THIS->selection.len = wcslen (THIS->selection.text); 1684 len = wcslen (text);
1597 } 1685 }
1598} 1686}
1687
1688char
1689rxvt_term::cur_charset ()
1690 CODE:
1691 RETVAL = THIS->charsets [THIS->screen.charset];
1692 OUTPUT:
1693 RETVAL
1599 1694
1600void 1695void
1601rxvt_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) 1696rxvt_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)
1602 1697
1603void 1698void
… …
1625 char *str = SvPVbyte (octets, len); 1720 char *str = SvPVbyte (octets, len);
1626 C_ARGS: 1721 C_ARGS:
1627 str, len 1722 str, len
1628 1723
1629void 1724void
1725rxvt_term::tt_paste (SV *octets)
1726 INIT:
1727 STRLEN len;
1728 char *str = SvPVbyte (octets, len);
1729 C_ARGS:
1730 str, len
1731
1732void
1630rxvt_term::cmd_parse (SV *octets) 1733rxvt_term::cmd_parse (SV *octets)
1631 CODE: 1734 CODE:
1632{ 1735{
1633 STRLEN len; 1736 STRLEN len;
1634 char *str = SvPVbyte (octets, len); 1737 char *str = SvPVbyte (octets, len);

Diff Legend

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