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

Diff Legend

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