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.110 by root, Thu Dec 14 17:22:04 2006 UTC vs.
Revision 1.156 by root, Sun Jun 3 15:54:05 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-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.
… …
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 "iom.h" 37#include "ev_cpp.h"
37#include "rxvt.h" 38#include "rxvt.h"
38#include "keyboard.h" 39#include "keyboard.h"
39#include "rxvtutil.h" 40#include "rxvtutil.h"
40#include "rxvtperl.h" 41#include "rxvtperl.h"
41 42
42#include "perlxsi.c" 43#include "perlxsi.c"
43 44
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 46
50#undef LINENO 47#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 49#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
54 51
55typedef int CHAINED UNUSED; 52/////////////////////////////////////////////////////////////////////////////
53
54typedef char * octet_string;
55typedef char * utf8_string;
56typedef SV * urxvt_color;
57
58typedef GdkPixbuf * urxvt__pixbuf;
59typedef rxvt_img * urxvt__img;
60
61/////////////////////////////////////////////////////////////////////////////
62
63static void
64parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
65{
66 //TODO: support component stuff
67 c.set (s, SvPVbyte_nolen (sv));
68}
56 69
57///////////////////////////////////////////////////////////////////////////// 70/////////////////////////////////////////////////////////////////////////////
58 71
59static wchar_t * 72static wchar_t *
60sv2wcs (SV *sv) 73sv2wcs (SV *sv)
… …
75 88
76 return sv; 89 return sv;
77} 90}
78 91
79static SV * 92static 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) 93newSVptr (void *ptr, const char *klass)
87{ 94{
88 HV *hv = newHV (); 95 HV *hv = newHV ();
89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 96 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
90 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 97 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
119 126
120///////////////////////////////////////////////////////////////////////////// 127/////////////////////////////////////////////////////////////////////////////
121 128
122#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 129#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
123 130
124class overlay { 131class overlay : overlay_base
132{
125 rxvt_term *THIS; 133 rxvt_term *THIS;
126 AV *overlay_av; 134 AV *overlay_av;
127 int x, y, w, h;
128 int border; 135 int border;
129 text_t **text;
130 rend_t **rend;
131 136
132public: 137public:
133 HV *self; 138 HV *self;
134 139
135 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 140 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
142 147
143 void set (int x, int y, SV *str, SV *rend); 148 void set (int x, int y, SV *str, SV *rend);
144}; 149};
145 150
146overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 151overlay::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) 152: THIS(THIS), border(border == 2), overlay_av (0)
148{ 153{
154 x = x_;
155 y = y_;
156 w = w_;
157 h = h_;
158
149 if (w < 0) w = 0; 159 if (w < 0) w = 0;
150 if (h < 0) h = 0; 160 if (h < 0) h = 0;
151 161
152 if (border == 2) 162 if (border == 2)
153 { 163 {
… …
222 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 232 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
223 )); 233 ));
224 av_push (overlay_av, newSViv ((long)this)); 234 av_push (overlay_av, newSViv ((long)this));
225 235
226 THIS->want_refresh = 1; 236 THIS->want_refresh = 1;
237 THIS->refresh_check ();
227} 238}
228 239
229void 240void
230overlay::hide () 241overlay::hide ()
231{ 242{
… …
245 256
246 SvREFCNT_dec (overlay_av); 257 SvREFCNT_dec (overlay_av);
247 overlay_av = 0; 258 overlay_av = 0;
248 259
249 THIS->want_refresh = 1; 260 THIS->want_refresh = 1;
261 THIS->refresh_check ();
250} 262}
251 263
252void overlay::swap () 264void overlay::swap ()
253{ 265{
254 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 266 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)); 267 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
256 268
257 int ov_w = min (w, THIS->ncol - ov_x); 269 int ov_w = min (w, THIS->ncol - ov_x);
258 int ov_h = min (h, THIS->nrow - ov_y); 270 int ov_h = min (h, THIS->nrow - ov_y);
271
272 // hide cursor if it is within the overlay area
273 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
274 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
275 THIS->screen.flags &= ~Screen_VisibleCursor;
259 276
260 for (int y = ov_h; y--; ) 277 for (int y = ov_h; y--; )
261 { 278 {
262 text_t *t1 = text [y]; 279 text_t *t1 = text [y];
263 rend_t *r1 = rend [y]; 280 rend_t *r1 = rend [y];
… …
299 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 316 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
300 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 317 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
301 } 318 }
302 319
303 THIS->want_refresh = 1; 320 THIS->want_refresh = 1;
321 THIS->refresh_check ();
304} 322}
305 323
306///////////////////////////////////////////////////////////////////////////// 324/////////////////////////////////////////////////////////////////////////////
307 325
308#define IOM_CLASS "urxvt"
309#include <iom_perl.h> 326#include "iom_perl.h"
310 327
311///////////////////////////////////////////////////////////////////////////// 328/////////////////////////////////////////////////////////////////////////////
312 329
313struct rxvt_perl_interp rxvt_perl; 330struct rxvt_perl_interp rxvt_perl;
314 331
… …
318{ 335{
319 if (perl) 336 if (perl)
320 { 337 {
321 perl_destruct (perl); 338 perl_destruct (perl);
322 perl_free (perl); 339 perl_free (perl);
340 PERL_SYS_TERM ();
323 } 341 }
324} 342}
325 343
326void 344void
327rxvt_perl_interp::init (rxvt_term *term) 345rxvt_perl_interp::init (rxvt_term *term)
328{ 346{
329 if (!perl) 347 if (!perl)
330 { 348 {
331 rxvt_push_locale (""); // perl init destroys current locale 349 rxvt_push_locale (""); // perl init destroys current locale
332 350
351 {
333 perl_environ = rxvt_environ; 352 perl_environ = rxvt_environ;
334 swap (perl_environ, environ); 353 localise_env set_environ (perl_environ);
335 354
336 char *argv[] = { 355 char *args[] = {
337 "", 356 "",
338 "-e" 357 "-e"
339 "BEGIN {" 358 "BEGIN {"
340 " urxvt->bootstrap;" 359 " urxvt->bootstrap;"
341 " unshift @INC, '" LIBDIR "';" 360 " unshift @INC, '" LIBDIR "';"
342 "}" 361 "}"
343 "" 362 ""
344 "use urxvt;" 363 "use urxvt;"
345 }; 364 };
365 int argc = ecb_array_length (args);
366 char **argv = args;
346 367
368 PERL_SYS_INIT3 (&argc, &argv, &environ);
347 perl = perl_alloc (); 369 perl = perl_alloc ();
348 perl_construct (perl); 370 perl_construct (perl);
349 371
350 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 372 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
351 || perl_run (perl)) 373 || perl_run (perl))
352 { 374 {
353 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 375 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
354 376
355 perl_destruct (perl); 377 perl_destruct (perl);
356 perl_free (perl); 378 perl_free (perl);
357 perl = 0; 379 perl = 0;
358 } 380 }
359 381 }
360 swap (perl_environ, environ);
361 382
362 rxvt_pop_locale (); 383 rxvt_pop_locale ();
363 } 384 }
364 385
365 if (perl) 386 if (perl)
366 { 387 {
367 // runs outside of perls ENV 388 // runs outside of perls ENV
368 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 389 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
369 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 390 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
391 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
370 } 392 }
371} 393}
372 394
373static void 395static void
374ungrab (rxvt_term *THIS) 396ungrab (rxvt_term *THIS)
… …
385rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 407rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
386{ 408{
387 if (!perl || !term->perl.self) 409 if (!perl || !term->perl.self)
388 return false; 410 return false;
389 411
412 localise_env set_environ (perl_environ);
413
390 // pre-handling of some events 414 // pre-handling of some events
391 if (htype == HOOK_REFRESH_END) 415 if (htype == HOOK_REFRESH_END)
392 { 416 {
393 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 417 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
394 418
395 for (int i = 0; i <= AvFILL (av); i++) 419 for (int i = 0; i <= AvFILL (av); i++)
396 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 420 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
397 } 421 }
422 else if (htype == HOOK_DESTROY)
423 {
424 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
398 425
399 swap (perl_environ, environ); 426 for (int i = AvFILL (av); i >= 0; i--)
427 {
428 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
429 delete req;
430 }
431 }
400 432
401 bool event_consumed; 433 bool event_consumed;
402 434
403 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 435 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
404 || term->perl.should_invoke [htype]) 436 || term->perl.should_invoke [htype])
405 try
406 { 437 {
407 dSP; 438 dSP;
408 va_list ap; 439 va_list ap;
409 440
410 va_start (ap, htype); 441 va_start (ap, htype);
411 442
412 ENTER; 443 ENTER;
413 SAVETMPS; 444 SAVETMPS;
414 445
415 PUSHMARK (SP); 446 PUSHMARK (SP);
416 447
448 EXTEND (SP, 2);
417 XPUSHs (sv_2mortal (newSVterm (term))); 449 PUSHs (sv_2mortal (newSVterm (term)));
418 XPUSHs (sv_2mortal (newSViv (htype))); 450 PUSHs (sv_2mortal (newSViv (htype)));
419 451
420 for (;;) { 452 for (;;) {
421 data_type dt = (data_type)va_arg (ap, int); 453 data_type dt = (data_type)va_arg (ap, int);
422 454
423 switch (dt) 455 switch (dt)
424 { 456 {
425 case DT_INT: 457 case DT_INT:
426 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 458 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
427 break; 459 break;
428 460
429 case DT_LONG: 461 case DT_LONG:
430 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 462 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
431 break; 463 break;
432 464
433 case DT_STR: 465 case DT_STR:
434 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 466 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
435 break; 467 break;
436 468
437 case DT_STR_LEN: 469 case DT_STR_LEN:
438 { 470 {
439 char *str = va_arg (ap, char *); 471 char *str = va_arg (ap, char *);
440 int len = va_arg (ap, int); 472 int len = va_arg (ap, int);
441 473
442 XPUSHs (sv_2mortal (newSVpvn (str, len))); 474 XPUSHs (sv_2mortal (newSVpvn (str, len)));
443 } 475 }
444 break; 476 break;
445 477
446 case DT_WCS_LEN: 478 case DT_WCS_LEN:
447 { 479 {
448 wchar_t *wstr = va_arg (ap, wchar_t *); 480 wchar_t *wstr = va_arg (ap, wchar_t *);
449 int wlen = va_arg (ap, int); 481 int wlen = va_arg (ap, int);
450 482
451 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 483 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
452 } 484 }
453 break; 485 break;
454 486
455 case DT_LCS_LEN: 487 case DT_LCS_LEN:
456 { 488 {
457 long *lstr = va_arg (ap, long *); 489 long *lstr = va_arg (ap, long *);
458 int llen = va_arg (ap, int); 490 int llen = va_arg (ap, int);
459 491
460 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 492 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
461 } 493 }
462 break; 494 break;
463 495
464 case DT_XEVENT: 496 case DT_XEVENT:
465 { 497 {
466 XEvent *xe = va_arg (ap, XEvent *); 498 XEvent *xe = va_arg (ap, XEvent *);
467 HV *hv = newHV (); 499 HV *hv = newHV ();
468 500
469# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 501# 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) 502# 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) 503# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
472# undef set 504# undef set
473 505
474 setiv (type, xe->type); 506 setiv (type, xe->type);
475 setiv (send_event, xe->xany.send_event); 507 setiv (send_event, xe->xany.send_event);
476 setiv (serial, xe->xany.serial); 508 setiv (serial, xe->xany.serial);
477 509
478 switch (xe->type) 510 switch (xe->type)
479 { 511 {
480 case KeyPress: 512 case KeyPress:
481 case KeyRelease: 513 case KeyRelease:
482 case ButtonPress: 514 case ButtonPress:
483 case ButtonRelease: 515 case ButtonRelease:
484 case MotionNotify: 516 case MotionNotify:
485 setuv (window, xe->xmotion.window); 517 setuv (window, xe->xmotion.window);
486 setuv (root, xe->xmotion.root); 518 setuv (root, xe->xmotion.root);
487 setuv (subwindow, xe->xmotion.subwindow); 519 setuv (subwindow, xe->xmotion.subwindow);
488 setuv (time, xe->xmotion.time); 520 setuv (time, xe->xmotion.time);
489 setiv (x, xe->xmotion.x); 521 setiv (x, xe->xmotion.x);
490 setiv (y, xe->xmotion.y); 522 setiv (y, xe->xmotion.y);
491 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 523 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
492 setiv (col, xe->xmotion.x / term->fwidth); 524 setiv (col, xe->xmotion.x / term->fwidth);
493 setiv (x_root, xe->xmotion.x_root); 525 setiv (x_root, xe->xmotion.x_root);
494 setiv (y_root, xe->xmotion.y_root); 526 setiv (y_root, xe->xmotion.y_root);
495 setuv (state, xe->xmotion.state); 527 setuv (state, xe->xmotion.state);
496 528
497 switch (xe->type) 529 switch (xe->type)
498 { 530 {
499 case KeyPress: 531 case KeyPress:
500 case KeyRelease: 532 case KeyRelease:
501 setuv (keycode, xe->xkey.keycode); 533 setuv (keycode, xe->xkey.keycode);
502 break; 534 break;
503 535
504 case ButtonPress: 536 case ButtonPress:
505 case ButtonRelease: 537 case ButtonRelease:
506 setuv (button, xe->xbutton.button); 538 setuv (button, xe->xbutton.button);
507 break; 539 break;
508 540
509 case MotionNotify: 541 case MotionNotify:
510 setiv (is_hint, xe->xmotion.is_hint); 542 setiv (is_hint, xe->xmotion.is_hint);
511 break; 543 break;
512 } 544 }
513 545
514 break; 546 break;
515 547
516 case MapNotify: 548 case MapNotify:
517 case UnmapNotify: 549 case UnmapNotify:
518 case ConfigureNotify: 550 case ConfigureNotify:
519 setuv (event, xe->xconfigure.event); 551 setuv (event, xe->xconfigure.event);
520 setuv (window, xe->xconfigure.window); 552 setuv (window, xe->xconfigure.window);
521 553
522 switch (xe->type) 554 switch (xe->type)
523 { 555 {
524 case ConfigureNotify: 556 case ConfigureNotify:
525 setiv (x, xe->xconfigure.x); 557 setiv (x, xe->xconfigure.x);
526 setiv (y, xe->xconfigure.y); 558 setiv (y, xe->xconfigure.y);
527 setiv (width, xe->xconfigure.width); 559 setiv (width, xe->xconfigure.width);
528 setiv (height, xe->xconfigure.height); 560 setiv (height, xe->xconfigure.height);
529 setuv (above, xe->xconfigure.above); 561 setuv (above, xe->xconfigure.above);
530 break; 562 break;
531 } 563 }
532 564
533 break; 565 break;
534 566
535 case PropertyNotify: 567 case PropertyNotify:
536 setuv (window, xe->xproperty.window); 568 setuv (window, xe->xproperty.window);
537 setuv (atom, xe->xproperty.atom); 569 setuv (atom, xe->xproperty.atom);
538 setuv (time, xe->xproperty.time); 570 setuv (time, xe->xproperty.time);
539 setiv (state, xe->xproperty.state); 571 setiv (state, xe->xproperty.state);
540 break; 572 break;
541 573
542 case ClientMessage: 574 case ClientMessage:
543 setuv (window, xe->xclient.window); 575 setuv (window, xe->xclient.window);
544 setuv (message_type, xe->xclient.message_type); 576 setuv (message_type, xe->xclient.message_type);
545 setuv (format, xe->xclient.format); 577 setuv (format, xe->xclient.format);
546 setuv (l0, xe->xclient.data.l[0]); 578 setuv (l0, xe->xclient.data.l[0]);
547 setuv (l1, xe->xclient.data.l[1]); 579 setuv (l1, xe->xclient.data.l[1]);
548 setuv (l2, xe->xclient.data.l[2]); 580 setuv (l2, xe->xclient.data.l[2]);
549 setuv (l3, xe->xclient.data.l[3]); 581 setuv (l3, xe->xclient.data.l[3]);
550 setuv (l4, xe->xclient.data.l[4]); 582 setuv (l4, xe->xclient.data.l[4]);
551 break; 583 break;
552 } 584 }
553 585
554 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 586 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
555 } 587 }
556 break; 588 break;
557 589
558 case DT_END: 590 case DT_END:
559 goto call; 591 goto call;
560 592
561 default: 593 default:
562 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 594 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
563 } 595 }
596 }
597
598 call:
599 va_end (ap);
600
601 PUTBACK;
602 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
603 SPAGAIN;
604
605 if (count)
606 {
607 SV *status = POPs;
608 count = SvTRUE (status);
564 } 609 }
565 610
566 call:
567 va_end (ap);
568
569 PUTBACK; 611 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; 612 FREETMPS;
581 LEAVE; 613 LEAVE;
582 614
583 if (SvTRUE (ERRSV)) 615 if (SvTRUE (ERRSV))
584 { 616 {
585 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 617 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
586 ungrab (term); // better lose the grab than the session 618 ungrab (term); // better lose the grab than the session
587 } 619 }
588 620
589 event_consumed = !!count; 621 event_consumed = !!count;
590 } 622 }
591 catch (...)
592 {
593 swap (perl_environ, environ);
594 throw;
595 }
596 else 623 else
597 event_consumed = false; 624 event_consumed = false;
598 625
599 // post-handling of some events 626 // post-handling of some events
600 if (htype == HOOK_REFRESH_BEGIN) 627 if (htype == HOOK_REFRESH_BEGIN)
601 { 628 {
602 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 629 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
603 630
604 for (int i = AvFILL (av); i >= 0; i--) 631 for (int i = AvFILL (av); i >= 0; i--)
605 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 632 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
606 } 633 }
607 else if (htype == HOOK_DESTROY) 634 else if (htype == HOOK_DESTROY)
608 { 635 {
609 clearSVptr ((SV *)term->perl.self); 636 clearSVptr ((SV *)term->perl.self);
610 SvREFCNT_dec ((SV *)term->perl.self); 637 SvREFCNT_dec ((SV *)term->perl.self);
611 638
612 // don't allow further calls 639 // don't allow further calls
613 term->perl.self = 0; 640 term->perl.self = 0;
614 } 641 }
615 642
616 swap (perl_environ, environ);
617
618 return event_consumed; 643 return event_consumed;
644}
645
646void
647rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
648{
649 localise_env set_environ (perl_environ);
650
651 ENTER;
652 SAVETMPS;
653
654 dSP;
655 XPUSHs (sv_2mortal (newSVpvn (data, len)));
656 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
657
658 if (SvTRUE (ERRSV))
659 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
660
661 FREETMPS;
662 LEAVE;
619} 663}
620 664
621///////////////////////////////////////////////////////////////////////////// 665/////////////////////////////////////////////////////////////////////////////
622 666
623MODULE = urxvt PACKAGE = urxvt 667MODULE = urxvt PACKAGE = urxvt
… …
635# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 679# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
636# include "hookinc.h" 680# include "hookinc.h"
637# undef def 681# undef def
638 682
639 HV *option = get_hv ("urxvt::OPTION", 1); 683 HV *option = get_hv ("urxvt::OPTION", 1);
640# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 684# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
641# define nodef(name) 685# define nodef(name)
642# include "optinc.h" 686# include "optinc.h"
643# undef nodef 687# undef nodef
644# undef def 688# undef def
645 689
… …
647 static const struct { 691 static const struct {
648 const char *name; 692 const char *name;
649 IV iv; 693 IV iv;
650 } *civ, const_iv[] = { 694 } *civ, const_iv[] = {
651# define const_iv(name) { # name, (IV)name } 695# define const_iv(name) { # name, (IV)name }
696 const_iv (NUM_RESOURCES),
652 const_iv (DEFAULT_RSTYLE), 697 const_iv (DEFAULT_RSTYLE),
653 const_iv (OVERLAY_RSTYLE), 698 const_iv (OVERLAY_RSTYLE),
699 const_iv (Color_Bits),
700 const_iv (RS_bgShift), const_iv (RS_bgMask),
701 const_iv (RS_fgShift), const_iv (RS_fgMask),
702 const_iv (RS_Careful),
703 const_iv (RS_fontCount),
704 const_iv (RS_fontShift),
705 const_iv (RS_fontMask),
706 const_iv (RS_baseattrMask),
707 const_iv (RS_attrMask),
708 const_iv (RS_redraw),
709 const_iv (RS_Sel),
654 const_iv (RS_Bold), 710 const_iv (RS_Bold),
655 const_iv (RS_Italic), 711 const_iv (RS_Italic),
656 const_iv (RS_Blink), 712 const_iv (RS_Blink),
657 const_iv (RS_RVid), 713 const_iv (RS_RVid),
658 const_iv (RS_Uline), 714 const_iv (RS_Uline),
… …
762 const_iv (XIMDontChange), 818 const_iv (XIMDontChange),
763# endif 819# endif
764# endif 820# endif
765 }; 821 };
766 822
767 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 823 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
768 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 824 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
769} 825}
770 826
771void 827void
772warn (const char *msg) 828warn (const char *msg)
773 CODE: 829 CODE:
… …
782_exit (int status) 838_exit (int status)
783 839
784NV 840NV
785NOW () 841NOW ()
786 CODE: 842 CODE:
787 RETVAL = NOW; 843 RETVAL = ev::now ();
788 OUTPUT: 844 OUTPUT:
789 RETVAL 845 RETVAL
790 846
791int 847int
792GET_BASEFG (int rend) 848GET_BASEFG (int rend)
… …
845 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 901 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
846 if ((*t)->perl.self) 902 if ((*t)->perl.self)
847 PUSHs (sv_2mortal (newSVterm (*t))); 903 PUSHs (sv_2mortal (newSVterm (*t)));
848} 904}
849 905
906IV
907_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
908 CODE:
909 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
910 req->cb_sv = newSVsv (cb);
911 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
912 av_push (av, newSViv ((IV)req));
913 RETVAL = (IV)req;
914 OUTPUT:
915 RETVAL
916
917void
918_delete_selection_request (IV req_)
919 CODE:
920 rxvt_selection *req = (rxvt_selection *)req_;
921 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
922 int i;
923
924 for (i = AvFILL (av); i >= 0; i--)
925 if (SvIV (*av_fetch (av, i, 1)) == req_)
926 break;
927
928 for (; i < AvFILL (av); i++)
929 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
930
931 av_pop (av);
932
933 delete req;
934
850MODULE = urxvt PACKAGE = urxvt::term 935MODULE = urxvt PACKAGE = urxvt::term
851 936
852SV * 937SV *
853_new (AV *env, AV *arg) 938_new (AV *env, AV *arg)
854 CODE: 939 CODE:
855{ 940{
856 rxvt_term *term = new rxvt_term; 941 rxvt_term *term = new rxvt_term;
857 942
858 stringvec *argv = new stringvec; 943 stringvec *argv = new stringvec;
859 stringvec *envv = new stringvec;
860
861 for (int i = 0; i <= AvFILL (arg); i++) 944 for (int i = 0; i <= AvFILL (arg); i++)
862 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 945 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
863 946
947 stringvec *envv = new stringvec;
864 for (int i = AvFILL (env) + 1; i--; ) 948 for (int i = AvFILL (env) + 1; i--; )
865 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 949 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
866 950
867 envv->push_back (0);
868
869 bool success;
870
871 try 951 try
872 { 952 {
873 success = term->init (argv, envv); 953 term->init (argv, envv);
874 } 954 }
875 catch (const class rxvt_failure_exception &e) 955 catch (const class rxvt_failure_exception &e)
876 {
877 success = false;
878 }
879
880 if (!success)
881 { 956 {
882 term->destroy (); 957 term->destroy ();
883 croak ("error while initializing new terminal instance"); 958 croak ("error while initializing new terminal instance");
884 } 959 }
885 960
… …
919 994
920void 995void
921rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 996rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
922 CODE: 997 CODE:
923 XUngrabKey (THIS->dpy, keycode, modifiers, window); 998 XUngrabKey (THIS->dpy, keycode, modifiers, window);
924
925void
926rxvt_term::XUngrabKeyboard (Time eventtime)
927 CODE:
928 XUngrabKeyboard (THIS->dpy, eventtime);
929 999
930bool 1000bool
931rxvt_term::grab (Time eventtime, int sync = 0) 1001rxvt_term::grab (Time eventtime, int sync = 0)
932 CODE: 1002 CODE:
933{ 1003{
… …
1048 free (wstr); 1118 free (wstr);
1049} 1119}
1050 OUTPUT: 1120 OUTPUT:
1051 RETVAL 1121 RETVAL
1052 1122
1053char *
1054rxvt_term::locale ()
1055 CODE:
1056 RETVAL = THIS->locale;
1057 OUTPUT:
1058 RETVAL
1059
1060#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1123#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1061 1124
1062#define TERM_OFFSET_width TERM_OFFSET(width) 1125#define TERM_OFFSET_width TERM_OFFSET(width)
1063#define TERM_OFFSET_height TERM_OFFSET(height) 1126#define TERM_OFFSET_height TERM_OFFSET(height)
1064#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1127#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1065#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1128#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1066#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1129#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1067#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1130#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1068#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1131#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1069#define TERM_OFFSET_focus TERM_OFFSET(focus) 1132#define TERM_OFFSET_focus TERM_OFFSET(focus)
1070#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1133#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1071#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1134#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1072#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1135#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1073#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1136#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1137#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1074#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1138#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1075#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1139#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1076#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1140#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1077 1141
1078int 1142int
1079rxvt_term::width () 1143rxvt_term::width ()
1080 ALIAS: 1144 ALIAS:
1081 width = TERM_OFFSET_width 1145 width = TERM_OFFSET_width
1082 height = TERM_OFFSET_height 1146 height = TERM_OFFSET_height
1083 fwidth = TERM_OFFSET_fwidth 1147 fwidth = TERM_OFFSET_fwidth
1084 fheight = TERM_OFFSET_fheight 1148 fheight = TERM_OFFSET_fheight
1085 fbase = TERM_OFFSET_fbase 1149 fbase = TERM_OFFSET_fbase
1086 nrow = TERM_OFFSET_nrow 1150 nrow = TERM_OFFSET_nrow
1087 ncol = TERM_OFFSET_ncol 1151 ncol = TERM_OFFSET_ncol
1088 focus = TERM_OFFSET_focus 1152 focus = TERM_OFFSET_focus
1089 mapped = TERM_OFFSET_mapped 1153 mapped = TERM_OFFSET_mapped
1090 int_bwidth = TERM_OFFSET_int_bwidth 1154 int_bwidth = TERM_OFFSET_int_bwidth
1091 ext_bwidth = TERM_OFFSET_ext_bwidth 1155 ext_bwidth = TERM_OFFSET_ext_bwidth
1092 lineSpace = TERM_OFFSET_lineSpace 1156 lineSpace = TERM_OFFSET_lineSpace
1157 letterSpace = TERM_OFFSET_letterSpace
1093 saveLines = TERM_OFFSET_saveLines 1158 saveLines = TERM_OFFSET_saveLines
1094 total_rows = TERM_OFFSET_total_rows 1159 total_rows = TERM_OFFSET_total_rows
1095 top_row = TERM_OFFSET_top_row 1160 top_row = TERM_OFFSET_top_row
1096 CODE: 1161 CODE:
1097 RETVAL = *(int *)((char *)THIS + ix); 1162 RETVAL = *(int *)((char *)THIS + ix);
1098 OUTPUT: 1163 OUTPUT:
1099 RETVAL 1164 RETVAL
1100 1165
… …
1111 { 1176 {
1112 case 0: RETVAL = THIS->ModLevel3Mask; break; 1177 case 0: RETVAL = THIS->ModLevel3Mask; break;
1113 case 1: RETVAL = THIS->ModMetaMask; break; 1178 case 1: RETVAL = THIS->ModMetaMask; break;
1114 case 2: RETVAL = THIS->ModNumLockMask; break; 1179 case 2: RETVAL = THIS->ModNumLockMask; break;
1115 case 3: RETVAL = THIS->current_screen; break; 1180 case 3: RETVAL = THIS->current_screen; break;
1181#ifdef CURSOR_BLINK
1116 case 4: RETVAL = THIS->hidden_cursor; break; 1182 case 4: RETVAL = THIS->hidden_cursor; break;
1183#endif
1117 } 1184 }
1118 OUTPUT: 1185 OUTPUT:
1119 RETVAL 1186 RETVAL
1120 1187
1121char * 1188char *
… …
1146 if (*i) 1213 if (*i)
1147 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1214 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1148} 1215}
1149 1216
1150int 1217int
1151rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1218rxvt_term::pty_ev_events (int events = ev::UNDEF)
1152 CODE: 1219 CODE:
1153 RETVAL = THIS->pty_ev.events; 1220 RETVAL = THIS->pty_ev.events;
1154 if (events != EVENT_UNDEF) 1221 if (events != ev::UNDEF)
1155 THIS->pty_ev.set (events); 1222 THIS->pty_ev.set (events);
1156 OUTPUT: 1223 OUTPUT:
1157 RETVAL 1224 RETVAL
1158 1225
1159int 1226int
… …
1164 RETVAL 1231 RETVAL
1165 1232
1166Window 1233Window
1167rxvt_term::parent () 1234rxvt_term::parent ()
1168 CODE: 1235 CODE:
1169 RETVAL = THIS->parent [0]; 1236 RETVAL = THIS->parent;
1170 OUTPUT: 1237 OUTPUT:
1171 RETVAL 1238 RETVAL
1172 1239
1173Window 1240Window
1174rxvt_term::vt () 1241rxvt_term::vt ()
… …
1201 if (newval <= 0) 1268 if (newval <= 0)
1202 THIS->scr_changeview (max (newval, THIS->top_row)); 1269 THIS->scr_changeview (max (newval, THIS->top_row));
1203} 1270}
1204 OUTPUT: 1271 OUTPUT:
1205 RETVAL 1272 RETVAL
1273
1274void
1275rxvt_term::set_urgency (bool enable)
1206 1276
1207void 1277void
1208rxvt_term::focus_in () 1278rxvt_term::focus_in ()
1209 1279
1210void 1280void
… …
1238 1308
1239void 1309void
1240rxvt_term::want_refresh () 1310rxvt_term::want_refresh ()
1241 CODE: 1311 CODE:
1242 THIS->want_refresh = 1; 1312 THIS->want_refresh = 1;
1313 THIS->refresh_check ();
1243 1314
1244void 1315void
1245rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1316rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1246 PPCODE: 1317 PPCODE:
1247{ 1318{
… …
1402SV * 1473SV *
1403rxvt_term::special_decode (SV *text) 1474rxvt_term::special_decode (SV *text)
1404 CODE: 1475 CODE:
1405{ 1476{
1406 wchar_t *wstr = sv2wcs (text); 1477 wchar_t *wstr = sv2wcs (text);
1407 int wlen = wcslen (wstr);
1408 int dlen = 0; 1478 int dlen = 0;
1409 1479
1410 // find length 1480 // find length
1411 for (wchar_t *s = wstr; *s; s++) 1481 for (wchar_t *s = wstr; *s; s++)
1412 if (*s == NOCHAR) 1482 if (*s == NOCHAR)
… …
1443# include "rsinc.h" 1513# include "rsinc.h"
1444# undef def 1514# undef def
1445# undef reserve 1515# undef reserve
1446 }; 1516 };
1447 1517
1448 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1518 rs = rslist + ecb_array_length (rslist);
1449 1519
1520 if (*name)
1450 do { 1521 {
1522 do {
1451 if (rs-- == rslist) 1523 if (rs-- == rslist)
1452 croak ("no such resource '%s', requested", name); 1524 croak ("no such resource '%s', requested", name);
1453 } while (strcmp (name, rs->name)); 1525 } while (strcmp (name, rs->name));
1454 1526
1455 index += rs->value; 1527 index += rs->value;
1528 }
1529 else
1530 {
1531 --rs;
1532 name = "";
1533 }
1456 1534
1457 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1535 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1458 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1536 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1459 1537
1460 if (GIMME_V != G_VOID) 1538 if (GIMME_V != G_VOID)
… …
1475 1553
1476const char * 1554const char *
1477rxvt_term::x_resource (const char *name) 1555rxvt_term::x_resource (const char *name)
1478 1556
1479bool 1557bool
1480rxvt_term::option (U32 optval, int set = -1) 1558rxvt_term::option (U8 optval, int set = -1)
1481 CODE: 1559 CODE:
1482{ 1560{
1483 RETVAL = THIS->options & optval; 1561 RETVAL = THIS->option (optval);
1484 1562
1485 if (set >= 0) 1563 if (set >= 0)
1486 { 1564 {
1487 if (set)
1488 THIS->options |= optval; 1565 THIS->set_option (optval, set);
1489 else
1490 THIS->options &= ~optval;
1491 1566
1492 if (THIS->check_ev.is_active ()) // avoid doing this before START 1567 if (THIS->init_done) // avoid doing this before START
1493 switch (optval) 1568 switch (optval)
1494 { 1569 {
1495 case Opt_skipBuiltinGlyphs: 1570 case Opt_skipBuiltinGlyphs:
1496 THIS->set_fonts (); 1571 THIS->set_fonts ();
1497 THIS->scr_remap_chars (); 1572 THIS->scr_remap_chars ();
1498 THIS->scr_touch (true); 1573 THIS->scr_touch (true);
1499 THIS->want_refresh = 1; 1574 THIS->want_refresh = 1;
1575 THIS->refresh_check ();
1500 break; 1576 break;
1577#ifdef CURSOR_BLINK
1578 case Opt_cursorBlink:
1579 THIS->cursor_blink_reset ();
1580 break;
1581#endif
1501 1582
1502 case Opt_cursorUnderline: 1583 case Opt_cursorUnderline:
1503 THIS->want_refresh = 1; 1584 THIS->want_refresh = 1;
1585 THIS->refresh_check ();
1504 break; 1586 break;
1505 1587
1506# case Opt_scrollBar_floating: 1588# case Opt_scrollBar_floating:
1507# case Opt_scrollBar_right: 1589# case Opt_scrollBar_right:
1508# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1590# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1518 CODE: 1600 CODE:
1519 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1601 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1520 THIS->keyboard->register_done (); 1602 THIS->keyboard->register_done ();
1521 OUTPUT: 1603 OUTPUT:
1522 RETVAL 1604 RETVAL
1605
1606void
1607rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1608 CODE:
1609 wchar_t *wstr = sv2wcs (str);
1610 THIS->keyboard->register_user_translation (keysym, state, wstr);
1611 free (wstr);
1523 1612
1524void 1613void
1525rxvt_term::screen_cur (...) 1614rxvt_term::screen_cur (...)
1526 PROTOTYPE: $;$$ 1615 PROTOTYPE: $;$$
1527 ALIAS: 1616 ALIAS:
… …
1541 EXTEND (SP, 2); 1630 EXTEND (SP, 2);
1542 PUSHs (sv_2mortal (newSViv (rc.row))); 1631 PUSHs (sv_2mortal (newSViv (rc.row)));
1543 PUSHs (sv_2mortal (newSViv (rc.col))); 1632 PUSHs (sv_2mortal (newSViv (rc.col)));
1544 } 1633 }
1545 1634
1546 if (items == 3) 1635 if (items >= 3)
1547 { 1636 {
1548 rc.row = SvIV (ST (1)); 1637 rc.row = SvIV (ST (1));
1549 rc.col = SvIV (ST (2)); 1638 rc.col = SvIV (ST (2));
1550 1639
1551 if (ix == 2) 1640 if (ix == 2)
… …
1566 1655
1567 clamp_it (rc.col, 0, THIS->ncol); 1656 clamp_it (rc.col, 0, THIS->ncol);
1568 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1657 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1569 1658
1570 if (ix) 1659 if (ix)
1660 {
1661 THIS->selection.screen = THIS->current_screen;
1662
1571 THIS->want_refresh = 1; 1663 THIS->want_refresh = 1;
1664 THIS->refresh_check ();
1572 } 1665 }
1666 }
1573} 1667}
1574 1668
1575char 1669int
1576rxvt_term::cur_charset () 1670rxvt_term::selection_screen (int screen = -1)
1577 CODE: 1671 CODE:
1578 RETVAL = THIS->charsets [THIS->screen.charset]; 1672 RETVAL = THIS->selection.screen;
1579 OUTPUT: 1673 if (screen >= 0)
1674 THIS->selection.screen = screen;
1675 OUTPUT:
1580 RETVAL 1676 RETVAL
1581 1677
1582void 1678void
1583rxvt_term::selection_clear () 1679rxvt_term::selection_clear (bool clipboard = false)
1584 1680
1585void 1681void
1586rxvt_term::selection_make (Time eventtime, bool rect = false) 1682rxvt_term::selection_make (Time eventtime, bool rect = false)
1587 CODE: 1683 CODE:
1588 THIS->selection.op = SELECTION_CONT; 1684 THIS->selection.op = SELECTION_CONT;
1589 THIS->selection.rect = rect; 1685 THIS->selection.rect = rect;
1590 THIS->selection_make (eventtime); 1686 THIS->selection_make (eventtime);
1591 1687
1592int 1688int
1593rxvt_term::selection_grab (Time eventtime) 1689rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1594 1690
1595void 1691void
1596rxvt_term::selection (SV *newtext = 0) 1692rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1597 PPCODE: 1693 PPCODE:
1598{ 1694{
1695 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1696 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1697
1599 if (GIMME_V != G_VOID) 1698 if (GIMME_V != G_VOID)
1600 XPUSHs (THIS->selection.text 1699 XPUSHs (text
1601 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1700 ? sv_2mortal (wcs2sv (text, len))
1602 : &PL_sv_undef); 1701 : &PL_sv_undef);
1603 1702
1604 if (newtext) 1703 if (newtext)
1605 { 1704 {
1606 free (THIS->selection.text); 1705 free (text);
1607 1706
1608 THIS->selection.text = sv2wcs (newtext); 1707 text = sv2wcs (newtext);
1609 THIS->selection.len = wcslen (THIS->selection.text); 1708 len = wcslen (text);
1610 } 1709 }
1611} 1710}
1711
1712char
1713rxvt_term::cur_charset ()
1714 CODE:
1715 RETVAL = THIS->charsets [THIS->screen.charset];
1716 OUTPUT:
1717 RETVAL
1612 1718
1613void 1719void
1614rxvt_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) 1720rxvt_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)
1615 1721
1616void 1722void
… …
1638 char *str = SvPVbyte (octets, len); 1744 char *str = SvPVbyte (octets, len);
1639 C_ARGS: 1745 C_ARGS:
1640 str, len 1746 str, len
1641 1747
1642void 1748void
1749rxvt_term::tt_paste (SV *octets)
1750 INIT:
1751 STRLEN len;
1752 char *str = SvPVbyte (octets, len);
1753 C_ARGS:
1754 str, len
1755
1756void
1643rxvt_term::cmd_parse (SV *octets) 1757rxvt_term::cmd_parse (SV *octets)
1644 CODE: 1758 CODE:
1645{ 1759{
1646 STRLEN len; 1760 STRLEN len;
1647 char *str = SvPVbyte (octets, len); 1761 char *str = SvPVbyte (octets, len);
… …
1683 Atom *props = XListProperties (THIS->dpy, window, &count); 1797 Atom *props = XListProperties (THIS->dpy, window, &count);
1684 1798
1685 EXTEND (SP, count); 1799 EXTEND (SP, count);
1686 while (count--) 1800 while (count--)
1687 PUSHs (newSVuv ((U32)props [count])); 1801 PUSHs (newSVuv ((U32)props [count]));
1688 1802
1689 XFree (props); 1803 XFree (props);
1690} 1804}
1691 1805
1692void 1806void
1693rxvt_term::XGetWindowProperty (Window window, Atom property) 1807rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1716 XFree (prop); 1830 XFree (prop);
1717 } 1831 }
1718} 1832}
1719 1833
1720void 1834void
1721rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1835rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1722 CODE: 1836 CODE:
1723{ 1837{
1724 STRLEN len; 1838 STRLEN len;
1725 char *data_ = SvPVbyte (data, len); 1839 char *data_ = SvPVbyte (data, len);
1726 1840
… …
1824void 1938void
1825overlay::DESTROY () 1939overlay::DESTROY ()
1826 1940
1827INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 1941INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1828 1942
1943MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1944
1945#if HAVE_PIXBUF
1946
1947urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
1948 C_ARGS: filename, 0
1949
1950void
1951DESTROY (urxvt::pixbuf self)
1952 CODE:
1953 gdk_pixbuf_unref (self);
1954
1955#endif
1956
1957MODULE = urxvt PACKAGE = urxvt::img
1958
1959#if HAVE_IMG
1960
1961# rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height);
1962# rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1963
1964void fill (urxvt::img self, SV *c)
1965 CODE:
1966 rxvt_color rc;
1967 parse_color (self->s, rc, c);
1968 self->fill (rc);
1969
1970void blur (urxvt::img self, int rh, int rv)
1971 CODE:
1972 self->blur (rh, rv);
1973
1974void brightness (urxvt::img self, double r, double g, double b, double a = 1.)
1975 CODE:
1976 self->brightness (r, g, b, a);
1977
1978void contrast (urxvt::img self, double r, double g, double b, double a = 1.)
1979 CODE:
1980 self->contrast (r, g, b, a);
1981
1982urxvt::img copy (urxvt::img self)
1983 CODE:
1984 RETVAL = self->copy ();
1985 OUTPUT:
1986 RETVAL
1987
1988urxvt::img scale (urxvt::img self, int new_width, int new_height)
1989 CODE:
1990 RETVAL = self->scale (new_width, new_height);
1991 OUTPUT:
1992 RETVAL
1993
1994# rxvt_img *transform (urxvt::img self, int new_width, int new_height, double matrix[16]);
1995
1996#endif
1997

Diff Legend

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