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