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.155 by root, Sun Jun 3 10:38:22 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.
… …
23#define line_t perl_line_t 23#define line_t perl_line_t
24#include <EXTERN.h> 24#include <EXTERN.h>
25#include <perl.h> 25#include <perl.h>
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28#undef bool // perl defines it's own bool type, except with g++... what a trap
28 29
29#include "../config.h" 30#include "../config.h"
30 31
31#include <cstddef> 32#include <stddef.h>
32#include <cstdarg> 33#include <stdarg.h>
33 34
34#include "unistd.h" 35#include "unistd.h"
35 36
36#include "ev_cpp.h" 37#include "ev_cpp.h"
37#include "rxvt.h" 38#include "rxvt.h"
… …
48#undef ROW 49#undef ROW
49#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
50 51
51///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
52 53
54typedef char * octet_string;
55typedef char * utf8_string;
56
57typedef GdkPixbuf * urxvt__pixbuf;
58typedef rxvt_img * urxvt__img;
59
60/////////////////////////////////////////////////////////////////////////////
61
53static wchar_t * 62static wchar_t *
54sv2wcs (SV *sv) 63sv2wcs (SV *sv)
55{ 64{
56 STRLEN len; 65 STRLEN len;
57 char *str = SvPVutf8 (sv, len); 66 char *str = SvPVutf8 (sv, len);
… …
107 116
108///////////////////////////////////////////////////////////////////////////// 117/////////////////////////////////////////////////////////////////////////////
109 118
110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 119#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
111 120
112class overlay { 121class overlay : overlay_base
122{
113 rxvt_term *THIS; 123 rxvt_term *THIS;
114 AV *overlay_av; 124 AV *overlay_av;
115 int x, y, w, h;
116 int border; 125 int border;
117 text_t **text;
118 rend_t **rend;
119 126
120public: 127public:
121 HV *self; 128 HV *self;
122 129
123 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 130 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
130 137
131 void set (int x, int y, SV *str, SV *rend); 138 void set (int x, int y, SV *str, SV *rend);
132}; 139};
133 140
134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 141overlay::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) 142: THIS(THIS), border(border == 2), overlay_av (0)
136{ 143{
144 x = x_;
145 y = y_;
146 w = w_;
147 h = h_;
148
137 if (w < 0) w = 0; 149 if (w < 0) w = 0;
138 if (h < 0) h = 0; 150 if (h < 0) h = 0;
139 151
140 if (border == 2) 152 if (border == 2)
141 { 153 {
… …
245 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 257 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
246 258
247 int ov_w = min (w, THIS->ncol - ov_x); 259 int ov_w = min (w, THIS->ncol - ov_x);
248 int ov_h = min (h, THIS->nrow - ov_y); 260 int ov_h = min (h, THIS->nrow - ov_y);
249 261
262 // hide cursor if it is within the overlay area
263 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
264 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
265 THIS->screen.flags &= ~Screen_VisibleCursor;
266
250 for (int y = ov_h; y--; ) 267 for (int y = ov_h; y--; )
251 { 268 {
252 text_t *t1 = text [y]; 269 text_t *t1 = text [y];
253 rend_t *r1 = rend [y]; 270 rend_t *r1 = rend [y];
254 271
… …
294 THIS->refresh_check (); 311 THIS->refresh_check ();
295} 312}
296 313
297///////////////////////////////////////////////////////////////////////////// 314/////////////////////////////////////////////////////////////////////////////
298 315
299#define IOM_CLASS "urxvt"
300#define IOM_WARN rxvt_warn
301#include "iom_perl.h" 316#include "iom_perl.h"
302 317
303///////////////////////////////////////////////////////////////////////////// 318/////////////////////////////////////////////////////////////////////////////
304 319
305struct rxvt_perl_interp rxvt_perl; 320struct rxvt_perl_interp rxvt_perl;
… …
310{ 325{
311 if (perl) 326 if (perl)
312 { 327 {
313 perl_destruct (perl); 328 perl_destruct (perl);
314 perl_free (perl); 329 perl_free (perl);
330 PERL_SYS_TERM ();
315 } 331 }
316} 332}
317 333
318void 334void
319rxvt_perl_interp::init (rxvt_term *term) 335rxvt_perl_interp::init (rxvt_term *term)
320{ 336{
321 if (!perl) 337 if (!perl)
322 { 338 {
323 rxvt_push_locale (""); // perl init destroys current locale 339 rxvt_push_locale (""); // perl init destroys current locale
324 340
341 {
325 perl_environ = rxvt_environ; 342 perl_environ = rxvt_environ;
326 swap (perl_environ, environ); 343 localise_env set_environ (perl_environ);
327 344
328 char *argv[] = { 345 char *args[] = {
329 "", 346 "",
330 "-e" 347 "-e"
331 "BEGIN {" 348 "BEGIN {"
332 " urxvt->bootstrap;" 349 " urxvt->bootstrap;"
333 " unshift @INC, '" LIBDIR "';" 350 " unshift @INC, '" LIBDIR "';"
334 "}" 351 "}"
335 "" 352 ""
336 "use urxvt;" 353 "use urxvt;"
337 }; 354 };
355 int argc = ecb_array_length (args);
356 char **argv = args;
338 357
358 PERL_SYS_INIT3 (&argc, &argv, &environ);
339 perl = perl_alloc (); 359 perl = perl_alloc ();
340 perl_construct (perl); 360 perl_construct (perl);
341 361
342 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 362 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
343 || perl_run (perl)) 363 || perl_run (perl))
344 { 364 {
345 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 365 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
346 366
347 perl_destruct (perl); 367 perl_destruct (perl);
348 perl_free (perl); 368 perl_free (perl);
349 perl = 0; 369 perl = 0;
350 } 370 }
351 371 }
352 swap (perl_environ, environ);
353 372
354 rxvt_pop_locale (); 373 rxvt_pop_locale ();
355 } 374 }
356 375
357 if (perl) 376 if (perl)
358 { 377 {
359 // runs outside of perls ENV 378 // runs outside of perls ENV
360 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 379 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); 380 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
381 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
362 } 382 }
363} 383}
364 384
365static void 385static void
366ungrab (rxvt_term *THIS) 386ungrab (rxvt_term *THIS)
… …
377rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 397rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
378{ 398{
379 if (!perl || !term->perl.self) 399 if (!perl || !term->perl.self)
380 return false; 400 return false;
381 401
402 localise_env set_environ (perl_environ);
403
382 // pre-handling of some events 404 // pre-handling of some events
383 if (htype == HOOK_REFRESH_END) 405 if (htype == HOOK_REFRESH_END)
384 { 406 {
385 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 407 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
386 408
387 for (int i = 0; i <= AvFILL (av); i++) 409 for (int i = 0; i <= AvFILL (av); i++)
388 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 410 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
389 } 411 }
412 else if (htype == HOOK_DESTROY)
413 {
414 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
390 415
391 swap (perl_environ, environ); 416 for (int i = AvFILL (av); i >= 0; i--)
417 {
418 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
419 delete req;
420 }
421 }
392 422
393 bool event_consumed; 423 bool event_consumed;
394 424
395 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 425 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
396 || term->perl.should_invoke [htype]) 426 || term->perl.should_invoke [htype])
397 try
398 { 427 {
399 dSP; 428 dSP;
400 va_list ap; 429 va_list ap;
401 430
402 va_start (ap, htype); 431 va_start (ap, htype);
403 432
404 ENTER; 433 ENTER;
405 SAVETMPS; 434 SAVETMPS;
406 435
407 PUSHMARK (SP); 436 PUSHMARK (SP);
408 437
438 EXTEND (SP, 2);
409 XPUSHs (sv_2mortal (newSVterm (term))); 439 PUSHs (sv_2mortal (newSVterm (term)));
410 XPUSHs (sv_2mortal (newSViv (htype))); 440 PUSHs (sv_2mortal (newSViv (htype)));
411 441
412 for (;;) { 442 for (;;) {
413 data_type dt = (data_type)va_arg (ap, int); 443 data_type dt = (data_type)va_arg (ap, int);
414 444
415 switch (dt) 445 switch (dt)
416 { 446 {
417 case DT_INT: 447 case DT_INT:
418 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 448 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
419 break; 449 break;
420 450
421 case DT_LONG: 451 case DT_LONG:
422 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 452 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
423 break; 453 break;
424 454
425 case DT_STR: 455 case DT_STR:
426 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 456 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
427 break; 457 break;
428 458
429 case DT_STR_LEN: 459 case DT_STR_LEN:
430 { 460 {
431 char *str = va_arg (ap, char *); 461 char *str = va_arg (ap, char *);
432 int len = va_arg (ap, int); 462 int len = va_arg (ap, int);
433 463
434 XPUSHs (sv_2mortal (newSVpvn (str, len))); 464 XPUSHs (sv_2mortal (newSVpvn (str, len)));
435 } 465 }
436 break; 466 break;
437 467
438 case DT_WCS_LEN: 468 case DT_WCS_LEN:
439 { 469 {
440 wchar_t *wstr = va_arg (ap, wchar_t *); 470 wchar_t *wstr = va_arg (ap, wchar_t *);
441 int wlen = va_arg (ap, int); 471 int wlen = va_arg (ap, int);
442 472
443 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 473 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
444 } 474 }
445 break; 475 break;
446 476
447 case DT_LCS_LEN: 477 case DT_LCS_LEN:
448 { 478 {
449 long *lstr = va_arg (ap, long *); 479 long *lstr = va_arg (ap, long *);
450 int llen = va_arg (ap, int); 480 int llen = va_arg (ap, int);
451 481
452 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 482 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
453 } 483 }
454 break; 484 break;
455 485
456 case DT_XEVENT: 486 case DT_XEVENT:
457 { 487 {
458 XEvent *xe = va_arg (ap, XEvent *); 488 XEvent *xe = va_arg (ap, XEvent *);
459 HV *hv = newHV (); 489 HV *hv = newHV ();
460 490
461# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 491# 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) 492# 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) 493# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
464# undef set 494# undef set
465 495
466 setiv (type, xe->type); 496 setiv (type, xe->type);
467 setiv (send_event, xe->xany.send_event); 497 setiv (send_event, xe->xany.send_event);
468 setiv (serial, xe->xany.serial); 498 setiv (serial, xe->xany.serial);
469 499
470 switch (xe->type) 500 switch (xe->type)
471 { 501 {
472 case KeyPress: 502 case KeyPress:
473 case KeyRelease: 503 case KeyRelease:
474 case ButtonPress: 504 case ButtonPress:
475 case ButtonRelease: 505 case ButtonRelease:
476 case MotionNotify: 506 case MotionNotify:
477 setuv (window, xe->xmotion.window); 507 setuv (window, xe->xmotion.window);
478 setuv (root, xe->xmotion.root); 508 setuv (root, xe->xmotion.root);
479 setuv (subwindow, xe->xmotion.subwindow); 509 setuv (subwindow, xe->xmotion.subwindow);
480 setuv (time, xe->xmotion.time); 510 setuv (time, xe->xmotion.time);
481 setiv (x, xe->xmotion.x); 511 setiv (x, xe->xmotion.x);
482 setiv (y, xe->xmotion.y); 512 setiv (y, xe->xmotion.y);
483 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 513 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
484 setiv (col, xe->xmotion.x / term->fwidth); 514 setiv (col, xe->xmotion.x / term->fwidth);
485 setiv (x_root, xe->xmotion.x_root); 515 setiv (x_root, xe->xmotion.x_root);
486 setiv (y_root, xe->xmotion.y_root); 516 setiv (y_root, xe->xmotion.y_root);
487 setuv (state, xe->xmotion.state); 517 setuv (state, xe->xmotion.state);
488 518
489 switch (xe->type) 519 switch (xe->type)
490 { 520 {
491 case KeyPress: 521 case KeyPress:
492 case KeyRelease: 522 case KeyRelease:
493 setuv (keycode, xe->xkey.keycode); 523 setuv (keycode, xe->xkey.keycode);
494 break; 524 break;
495 525
496 case ButtonPress: 526 case ButtonPress:
497 case ButtonRelease: 527 case ButtonRelease:
498 setuv (button, xe->xbutton.button); 528 setuv (button, xe->xbutton.button);
499 break; 529 break;
500 530
501 case MotionNotify: 531 case MotionNotify:
502 setiv (is_hint, xe->xmotion.is_hint); 532 setiv (is_hint, xe->xmotion.is_hint);
503 break; 533 break;
504 } 534 }
505 535
506 break; 536 break;
507 537
508 case MapNotify: 538 case MapNotify:
509 case UnmapNotify: 539 case UnmapNotify:
510 case ConfigureNotify: 540 case ConfigureNotify:
511 setuv (event, xe->xconfigure.event); 541 setuv (event, xe->xconfigure.event);
512 setuv (window, xe->xconfigure.window); 542 setuv (window, xe->xconfigure.window);
513 543
514 switch (xe->type) 544 switch (xe->type)
515 { 545 {
516 case ConfigureNotify: 546 case ConfigureNotify:
517 setiv (x, xe->xconfigure.x); 547 setiv (x, xe->xconfigure.x);
518 setiv (y, xe->xconfigure.y); 548 setiv (y, xe->xconfigure.y);
519 setiv (width, xe->xconfigure.width); 549 setiv (width, xe->xconfigure.width);
520 setiv (height, xe->xconfigure.height); 550 setiv (height, xe->xconfigure.height);
521 setuv (above, xe->xconfigure.above); 551 setuv (above, xe->xconfigure.above);
522 break; 552 break;
523 } 553 }
524 554
525 break; 555 break;
526 556
527 case PropertyNotify: 557 case PropertyNotify:
528 setuv (window, xe->xproperty.window); 558 setuv (window, xe->xproperty.window);
529 setuv (atom, xe->xproperty.atom); 559 setuv (atom, xe->xproperty.atom);
530 setuv (time, xe->xproperty.time); 560 setuv (time, xe->xproperty.time);
531 setiv (state, xe->xproperty.state); 561 setiv (state, xe->xproperty.state);
532 break; 562 break;
533 563
534 case ClientMessage: 564 case ClientMessage:
535 setuv (window, xe->xclient.window); 565 setuv (window, xe->xclient.window);
536 setuv (message_type, xe->xclient.message_type); 566 setuv (message_type, xe->xclient.message_type);
537 setuv (format, xe->xclient.format); 567 setuv (format, xe->xclient.format);
538 setuv (l0, xe->xclient.data.l[0]); 568 setuv (l0, xe->xclient.data.l[0]);
539 setuv (l1, xe->xclient.data.l[1]); 569 setuv (l1, xe->xclient.data.l[1]);
540 setuv (l2, xe->xclient.data.l[2]); 570 setuv (l2, xe->xclient.data.l[2]);
541 setuv (l3, xe->xclient.data.l[3]); 571 setuv (l3, xe->xclient.data.l[3]);
542 setuv (l4, xe->xclient.data.l[4]); 572 setuv (l4, xe->xclient.data.l[4]);
543 break; 573 break;
544 } 574 }
545 575
546 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 576 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
547 } 577 }
548 break; 578 break;
549 579
550 case DT_END: 580 case DT_END:
551 goto call; 581 goto call;
552 582
553 default: 583 default:
554 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 584 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
555 } 585 }
586 }
587
588 call:
589 va_end (ap);
590
591 PUTBACK;
592 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
593 SPAGAIN;
594
595 if (count)
596 {
597 SV *status = POPs;
598 count = SvTRUE (status);
556 } 599 }
557 600
558 call:
559 va_end (ap);
560
561 PUTBACK; 601 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; 602 FREETMPS;
573 LEAVE; 603 LEAVE;
574 604
575 if (SvTRUE (ERRSV)) 605 if (SvTRUE (ERRSV))
576 { 606 {
577 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 607 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
578 ungrab (term); // better lose the grab than the session 608 ungrab (term); // better lose the grab than the session
579 } 609 }
580 610
581 event_consumed = !!count; 611 event_consumed = !!count;
582 } 612 }
583 catch (...)
584 {
585 swap (perl_environ, environ);
586 throw;
587 }
588 else 613 else
589 event_consumed = false; 614 event_consumed = false;
590 615
591 // post-handling of some events 616 // post-handling of some events
592 if (htype == HOOK_REFRESH_BEGIN) 617 if (htype == HOOK_REFRESH_BEGIN)
… …
603 628
604 // don't allow further calls 629 // don't allow further calls
605 term->perl.self = 0; 630 term->perl.self = 0;
606 } 631 }
607 632
608 swap (perl_environ, environ);
609
610 return event_consumed; 633 return event_consumed;
634}
635
636void
637rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
638{
639 localise_env set_environ (perl_environ);
640
641 ENTER;
642 SAVETMPS;
643
644 dSP;
645 XPUSHs (sv_2mortal (newSVpvn (data, len)));
646 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
647
648 if (SvTRUE (ERRSV))
649 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
650
651 FREETMPS;
652 LEAVE;
611} 653}
612 654
613///////////////////////////////////////////////////////////////////////////// 655/////////////////////////////////////////////////////////////////////////////
614 656
615MODULE = urxvt PACKAGE = urxvt 657MODULE = urxvt PACKAGE = urxvt
… …
627# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 669# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
628# include "hookinc.h" 670# include "hookinc.h"
629# undef def 671# undef def
630 672
631 HV *option = get_hv ("urxvt::OPTION", 1); 673 HV *option = get_hv ("urxvt::OPTION", 1);
632# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 674# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
633# define nodef(name) 675# define nodef(name)
634# include "optinc.h" 676# include "optinc.h"
635# undef nodef 677# undef nodef
636# undef def 678# undef def
637 679
… …
639 static const struct { 681 static const struct {
640 const char *name; 682 const char *name;
641 IV iv; 683 IV iv;
642 } *civ, const_iv[] = { 684 } *civ, const_iv[] = {
643# define const_iv(name) { # name, (IV)name } 685# define const_iv(name) { # name, (IV)name }
686 const_iv (NUM_RESOURCES),
644 const_iv (DEFAULT_RSTYLE), 687 const_iv (DEFAULT_RSTYLE),
645 const_iv (OVERLAY_RSTYLE), 688 const_iv (OVERLAY_RSTYLE),
689 const_iv (Color_Bits),
690 const_iv (RS_bgShift), const_iv (RS_bgMask),
691 const_iv (RS_fgShift), const_iv (RS_fgMask),
692 const_iv (RS_Careful),
693 const_iv (RS_fontCount),
694 const_iv (RS_fontShift),
695 const_iv (RS_fontMask),
696 const_iv (RS_baseattrMask),
697 const_iv (RS_attrMask),
698 const_iv (RS_redraw),
699 const_iv (RS_Sel),
646 const_iv (RS_Bold), 700 const_iv (RS_Bold),
647 const_iv (RS_Italic), 701 const_iv (RS_Italic),
648 const_iv (RS_Blink), 702 const_iv (RS_Blink),
649 const_iv (RS_RVid), 703 const_iv (RS_RVid),
650 const_iv (RS_Uline), 704 const_iv (RS_Uline),
… …
754 const_iv (XIMDontChange), 808 const_iv (XIMDontChange),
755# endif 809# endif
756# endif 810# endif
757 }; 811 };
758 812
759 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 813 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
760 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 814 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
761} 815}
762 816
763void 817void
764warn (const char *msg) 818warn (const char *msg)
765 CODE: 819 CODE:
… …
837 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 891 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
838 if ((*t)->perl.self) 892 if ((*t)->perl.self)
839 PUSHs (sv_2mortal (newSVterm (*t))); 893 PUSHs (sv_2mortal (newSVterm (*t)));
840} 894}
841 895
896IV
897_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
898 CODE:
899 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
900 req->cb_sv = newSVsv (cb);
901 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
902 av_push (av, newSViv ((IV)req));
903 RETVAL = (IV)req;
904 OUTPUT:
905 RETVAL
906
907void
908_delete_selection_request (IV req_)
909 CODE:
910 rxvt_selection *req = (rxvt_selection *)req_;
911 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
912 int i;
913
914 for (i = AvFILL (av); i >= 0; i--)
915 if (SvIV (*av_fetch (av, i, 1)) == req_)
916 break;
917
918 for (; i < AvFILL (av); i++)
919 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
920
921 av_pop (av);
922
923 delete req;
924
842MODULE = urxvt PACKAGE = urxvt::term 925MODULE = urxvt PACKAGE = urxvt::term
843 926
844SV * 927SV *
845_new (AV *env, AV *arg) 928_new (AV *env, AV *arg)
846 CODE: 929 CODE:
847{ 930{
848 rxvt_term *term = new rxvt_term; 931 rxvt_term *term = new rxvt_term;
849 932
850 stringvec *argv = new stringvec; 933 stringvec *argv = new stringvec;
851 stringvec *envv = new stringvec;
852
853 for (int i = 0; i <= AvFILL (arg); i++) 934 for (int i = 0; i <= AvFILL (arg); i++)
854 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 935 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
855 936
937 stringvec *envv = new stringvec;
856 for (int i = AvFILL (env) + 1; i--; ) 938 for (int i = AvFILL (env) + 1; i--; )
857 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 939 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
858
859 envv->push_back (0);
860 940
861 try 941 try
862 { 942 {
863 term->init (argv, envv); 943 term->init (argv, envv);
864 } 944 }
… …
904 984
905void 985void
906rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 986rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
907 CODE: 987 CODE:
908 XUngrabKey (THIS->dpy, keycode, modifiers, window); 988 XUngrabKey (THIS->dpy, keycode, modifiers, window);
909
910void
911rxvt_term::XUngrabKeyboard (Time eventtime)
912 CODE:
913 XUngrabKeyboard (THIS->dpy, eventtime);
914 989
915bool 990bool
916rxvt_term::grab (Time eventtime, int sync = 0) 991rxvt_term::grab (Time eventtime, int sync = 0)
917 CODE: 992 CODE:
918{ 993{
… …
1033 free (wstr); 1108 free (wstr);
1034} 1109}
1035 OUTPUT: 1110 OUTPUT:
1036 RETVAL 1111 RETVAL
1037 1112
1038char *
1039rxvt_term::locale ()
1040 CODE:
1041 RETVAL = THIS->locale;
1042 OUTPUT:
1043 RETVAL
1044
1045#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1113#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1046 1114
1047#define TERM_OFFSET_width TERM_OFFSET(width) 1115#define TERM_OFFSET_width TERM_OFFSET(width)
1048#define TERM_OFFSET_height TERM_OFFSET(height) 1116#define TERM_OFFSET_height TERM_OFFSET(height)
1049#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1117#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1050#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1118#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1051#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1119#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1052#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1120#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1053#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1121#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1054#define TERM_OFFSET_focus TERM_OFFSET(focus) 1122#define TERM_OFFSET_focus TERM_OFFSET(focus)
1055#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1123#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1056#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1124#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1057#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1125#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1058#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1126#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1127#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1059#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1128#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1060#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1129#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1061#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1130#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1062 1131
1063int 1132int
1064rxvt_term::width () 1133rxvt_term::width ()
1065 ALIAS: 1134 ALIAS:
1066 width = TERM_OFFSET_width 1135 width = TERM_OFFSET_width
1067 height = TERM_OFFSET_height 1136 height = TERM_OFFSET_height
1068 fwidth = TERM_OFFSET_fwidth 1137 fwidth = TERM_OFFSET_fwidth
1069 fheight = TERM_OFFSET_fheight 1138 fheight = TERM_OFFSET_fheight
1070 fbase = TERM_OFFSET_fbase 1139 fbase = TERM_OFFSET_fbase
1071 nrow = TERM_OFFSET_nrow 1140 nrow = TERM_OFFSET_nrow
1072 ncol = TERM_OFFSET_ncol 1141 ncol = TERM_OFFSET_ncol
1073 focus = TERM_OFFSET_focus 1142 focus = TERM_OFFSET_focus
1074 mapped = TERM_OFFSET_mapped 1143 mapped = TERM_OFFSET_mapped
1075 int_bwidth = TERM_OFFSET_int_bwidth 1144 int_bwidth = TERM_OFFSET_int_bwidth
1076 ext_bwidth = TERM_OFFSET_ext_bwidth 1145 ext_bwidth = TERM_OFFSET_ext_bwidth
1077 lineSpace = TERM_OFFSET_lineSpace 1146 lineSpace = TERM_OFFSET_lineSpace
1147 letterSpace = TERM_OFFSET_letterSpace
1078 saveLines = TERM_OFFSET_saveLines 1148 saveLines = TERM_OFFSET_saveLines
1079 total_rows = TERM_OFFSET_total_rows 1149 total_rows = TERM_OFFSET_total_rows
1080 top_row = TERM_OFFSET_top_row 1150 top_row = TERM_OFFSET_top_row
1081 CODE: 1151 CODE:
1082 RETVAL = *(int *)((char *)THIS + ix); 1152 RETVAL = *(int *)((char *)THIS + ix);
1083 OUTPUT: 1153 OUTPUT:
1084 RETVAL 1154 RETVAL
1085 1155
… …
1096 { 1166 {
1097 case 0: RETVAL = THIS->ModLevel3Mask; break; 1167 case 0: RETVAL = THIS->ModLevel3Mask; break;
1098 case 1: RETVAL = THIS->ModMetaMask; break; 1168 case 1: RETVAL = THIS->ModMetaMask; break;
1099 case 2: RETVAL = THIS->ModNumLockMask; break; 1169 case 2: RETVAL = THIS->ModNumLockMask; break;
1100 case 3: RETVAL = THIS->current_screen; break; 1170 case 3: RETVAL = THIS->current_screen; break;
1171#ifdef CURSOR_BLINK
1101 case 4: RETVAL = THIS->hidden_cursor; break; 1172 case 4: RETVAL = THIS->hidden_cursor; break;
1173#endif
1102 } 1174 }
1103 OUTPUT: 1175 OUTPUT:
1104 RETVAL 1176 RETVAL
1105 1177
1106char * 1178char *
… …
1149 RETVAL 1221 RETVAL
1150 1222
1151Window 1223Window
1152rxvt_term::parent () 1224rxvt_term::parent ()
1153 CODE: 1225 CODE:
1154 RETVAL = THIS->parent [0]; 1226 RETVAL = THIS->parent;
1155 OUTPUT: 1227 OUTPUT:
1156 RETVAL 1228 RETVAL
1157 1229
1158Window 1230Window
1159rxvt_term::vt () 1231rxvt_term::vt ()
… …
1186 if (newval <= 0) 1258 if (newval <= 0)
1187 THIS->scr_changeview (max (newval, THIS->top_row)); 1259 THIS->scr_changeview (max (newval, THIS->top_row));
1188} 1260}
1189 OUTPUT: 1261 OUTPUT:
1190 RETVAL 1262 RETVAL
1263
1264void
1265rxvt_term::set_urgency (bool enable)
1191 1266
1192void 1267void
1193rxvt_term::focus_in () 1268rxvt_term::focus_in ()
1194 1269
1195void 1270void
… …
1428# include "rsinc.h" 1503# include "rsinc.h"
1429# undef def 1504# undef def
1430# undef reserve 1505# undef reserve
1431 }; 1506 };
1432 1507
1433 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1508 rs = rslist + ecb_array_length (rslist);
1434 1509
1510 if (*name)
1435 do { 1511 {
1512 do {
1436 if (rs-- == rslist) 1513 if (rs-- == rslist)
1437 croak ("no such resource '%s', requested", name); 1514 croak ("no such resource '%s', requested", name);
1438 } while (strcmp (name, rs->name)); 1515 } while (strcmp (name, rs->name));
1439 1516
1440 index += rs->value; 1517 index += rs->value;
1518 }
1519 else
1520 {
1521 --rs;
1522 name = "";
1523 }
1441 1524
1442 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1525 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1443 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1526 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1444 1527
1445 if (GIMME_V != G_VOID) 1528 if (GIMME_V != G_VOID)
… …
1469 1552
1470 if (set >= 0) 1553 if (set >= 0)
1471 { 1554 {
1472 THIS->set_option (optval, set); 1555 THIS->set_option (optval, set);
1473 1556
1474 if (THIS->env_colorfgbg [0]) // avoid doing this before START 1557 if (THIS->init_done) // avoid doing this before START
1475 switch (optval) 1558 switch (optval)
1476 { 1559 {
1477 case Opt_skipBuiltinGlyphs: 1560 case Opt_skipBuiltinGlyphs:
1478 THIS->set_fonts (); 1561 THIS->set_fonts ();
1479 THIS->scr_remap_chars (); 1562 THIS->scr_remap_chars ();
1480 THIS->scr_touch (true); 1563 THIS->scr_touch (true);
1481 THIS->want_refresh = 1; 1564 THIS->want_refresh = 1;
1482 THIS->refresh_check (); 1565 THIS->refresh_check ();
1483 break; 1566 break;
1567#ifdef CURSOR_BLINK
1568 case Opt_cursorBlink:
1569 THIS->cursor_blink_reset ();
1570 break;
1571#endif
1484 1572
1485 case Opt_cursorUnderline: 1573 case Opt_cursorUnderline:
1486 THIS->want_refresh = 1; 1574 THIS->want_refresh = 1;
1487 THIS->refresh_check (); 1575 THIS->refresh_check ();
1488 break; 1576 break;
… …
1502 CODE: 1590 CODE:
1503 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1591 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1504 THIS->keyboard->register_done (); 1592 THIS->keyboard->register_done ();
1505 OUTPUT: 1593 OUTPUT:
1506 RETVAL 1594 RETVAL
1595
1596void
1597rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1598 CODE:
1599 wchar_t *wstr = sv2wcs (str);
1600 THIS->keyboard->register_user_translation (keysym, state, wstr);
1601 free (wstr);
1507 1602
1508void 1603void
1509rxvt_term::screen_cur (...) 1604rxvt_term::screen_cur (...)
1510 PROTOTYPE: $;$$ 1605 PROTOTYPE: $;$$
1511 ALIAS: 1606 ALIAS:
… …
1525 EXTEND (SP, 2); 1620 EXTEND (SP, 2);
1526 PUSHs (sv_2mortal (newSViv (rc.row))); 1621 PUSHs (sv_2mortal (newSViv (rc.row)));
1527 PUSHs (sv_2mortal (newSViv (rc.col))); 1622 PUSHs (sv_2mortal (newSViv (rc.col)));
1528 } 1623 }
1529 1624
1530 if (items == 3) 1625 if (items >= 3)
1531 { 1626 {
1532 rc.row = SvIV (ST (1)); 1627 rc.row = SvIV (ST (1));
1533 rc.col = SvIV (ST (2)); 1628 rc.col = SvIV (ST (2));
1534 1629
1535 if (ix == 2) 1630 if (ix == 2)
… …
1551 clamp_it (rc.col, 0, THIS->ncol); 1646 clamp_it (rc.col, 0, THIS->ncol);
1552 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1647 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1553 1648
1554 if (ix) 1649 if (ix)
1555 { 1650 {
1651 THIS->selection.screen = THIS->current_screen;
1652
1556 THIS->want_refresh = 1; 1653 THIS->want_refresh = 1;
1557 THIS->refresh_check (); 1654 THIS->refresh_check ();
1558 } 1655 }
1559 } 1656 }
1560} 1657}
1561 1658
1562char 1659int
1563rxvt_term::cur_charset () 1660rxvt_term::selection_screen (int screen = -1)
1564 CODE: 1661 CODE:
1565 RETVAL = THIS->charsets [THIS->screen.charset]; 1662 RETVAL = THIS->selection.screen;
1566 OUTPUT: 1663 if (screen >= 0)
1664 THIS->selection.screen = screen;
1665 OUTPUT:
1567 RETVAL 1666 RETVAL
1568 1667
1569void 1668void
1570rxvt_term::selection_clear () 1669rxvt_term::selection_clear (bool clipboard = false)
1571 1670
1572void 1671void
1573rxvt_term::selection_make (Time eventtime, bool rect = false) 1672rxvt_term::selection_make (Time eventtime, bool rect = false)
1574 CODE: 1673 CODE:
1575 THIS->selection.op = SELECTION_CONT; 1674 THIS->selection.op = SELECTION_CONT;
1576 THIS->selection.rect = rect; 1675 THIS->selection.rect = rect;
1577 THIS->selection_make (eventtime); 1676 THIS->selection_make (eventtime);
1578 1677
1579int 1678int
1580rxvt_term::selection_grab (Time eventtime) 1679rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1581 1680
1582void 1681void
1583rxvt_term::selection (SV *newtext = 0) 1682rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1584 PPCODE: 1683 PPCODE:
1585{ 1684{
1685 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1686 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1687
1586 if (GIMME_V != G_VOID) 1688 if (GIMME_V != G_VOID)
1587 XPUSHs (THIS->selection.text 1689 XPUSHs (text
1588 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1690 ? sv_2mortal (wcs2sv (text, len))
1589 : &PL_sv_undef); 1691 : &PL_sv_undef);
1590 1692
1591 if (newtext) 1693 if (newtext)
1592 { 1694 {
1593 free (THIS->selection.text); 1695 free (text);
1594 1696
1595 THIS->selection.text = sv2wcs (newtext); 1697 text = sv2wcs (newtext);
1596 THIS->selection.len = wcslen (THIS->selection.text); 1698 len = wcslen (text);
1597 } 1699 }
1598} 1700}
1701
1702char
1703rxvt_term::cur_charset ()
1704 CODE:
1705 RETVAL = THIS->charsets [THIS->screen.charset];
1706 OUTPUT:
1707 RETVAL
1599 1708
1600void 1709void
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) 1710rxvt_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 1711
1603void 1712void
… …
1625 char *str = SvPVbyte (octets, len); 1734 char *str = SvPVbyte (octets, len);
1626 C_ARGS: 1735 C_ARGS:
1627 str, len 1736 str, len
1628 1737
1629void 1738void
1739rxvt_term::tt_paste (SV *octets)
1740 INIT:
1741 STRLEN len;
1742 char *str = SvPVbyte (octets, len);
1743 C_ARGS:
1744 str, len
1745
1746void
1630rxvt_term::cmd_parse (SV *octets) 1747rxvt_term::cmd_parse (SV *octets)
1631 CODE: 1748 CODE:
1632{ 1749{
1633 STRLEN len; 1750 STRLEN len;
1634 char *str = SvPVbyte (octets, len); 1751 char *str = SvPVbyte (octets, len);
… …
1811void 1928void
1812overlay::DESTROY () 1929overlay::DESTROY ()
1813 1930
1814INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 1931INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1815 1932
1933MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1934
1935urxvt::pixbuf gdk_pixbuf_new_from_file (octet_string filename, GError **error = 0)
1936
1937void
1938DESTROY (urxvt::pixbuf self)
1939 CODE:
1940 gdk_pixbuf_unref (self);
1941

Diff Legend

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