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