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.109 by root, Thu Dec 14 15:19:31 2006 UTC vs.
Revision 1.153 by sf-exg, Wed Apr 11 10:20:00 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;
56
57///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
58 53
59static wchar_t * 54static wchar_t *
60sv2wcs (SV *sv) 55sv2wcs (SV *sv)
61{ 56{
… …
75 70
76 return sv; 71 return sv;
77} 72}
78 73
79static SV * 74static 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) 75newSVptr (void *ptr, const char *klass)
87{ 76{
88 HV *hv = newHV (); 77 HV *hv = newHV ();
89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 78 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
90 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 79 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
119 108
120///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
121 110
122#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 111#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
123 112
124class overlay { 113class overlay : overlay_base
114{
125 rxvt_term *THIS; 115 rxvt_term *THIS;
126 AV *overlay_av; 116 AV *overlay_av;
127 int x, y, w, h;
128 int border; 117 int border;
129 text_t **text;
130 rend_t **rend;
131 118
132public: 119public:
133 HV *self; 120 HV *self;
134 121
135 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 122 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
142 129
143 void set (int x, int y, SV *str, SV *rend); 130 void set (int x, int y, SV *str, SV *rend);
144}; 131};
145 132
146overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 133overlay::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) 134: THIS(THIS), border(border == 2), overlay_av (0)
148{ 135{
136 x = x_;
137 y = y_;
138 w = w_;
139 h = h_;
140
149 if (w < 0) w = 0; 141 if (w < 0) w = 0;
150 if (h < 0) h = 0; 142 if (h < 0) h = 0;
151 143
152 if (border == 2) 144 if (border == 2)
153 { 145 {
… …
222 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
223 )); 215 ));
224 av_push (overlay_av, newSViv ((long)this)); 216 av_push (overlay_av, newSViv ((long)this));
225 217
226 THIS->want_refresh = 1; 218 THIS->want_refresh = 1;
219 THIS->refresh_check ();
227} 220}
228 221
229void 222void
230overlay::hide () 223overlay::hide ()
231{ 224{
… …
245 238
246 SvREFCNT_dec (overlay_av); 239 SvREFCNT_dec (overlay_av);
247 overlay_av = 0; 240 overlay_av = 0;
248 241
249 THIS->want_refresh = 1; 242 THIS->want_refresh = 1;
243 THIS->refresh_check ();
250} 244}
251 245
252void overlay::swap () 246void overlay::swap ()
253{ 247{
254 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 248 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)); 249 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
256 250
257 int ov_w = min (w, THIS->ncol - ov_x); 251 int ov_w = min (w, THIS->ncol - ov_x);
258 int ov_h = min (h, THIS->nrow - ov_y); 252 int ov_h = min (h, THIS->nrow - ov_y);
253
254 // hide cursor if it is within the overlay area
255 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
256 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
257 THIS->screen.flags &= ~Screen_VisibleCursor;
259 258
260 for (int y = ov_h; y--; ) 259 for (int y = ov_h; y--; )
261 { 260 {
262 text_t *t1 = text [y]; 261 text_t *t1 = text [y];
263 rend_t *r1 = rend [y]; 262 rend_t *r1 = rend [y];
… …
299 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 298 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
300 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 299 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
301 } 300 }
302 301
303 THIS->want_refresh = 1; 302 THIS->want_refresh = 1;
303 THIS->refresh_check ();
304} 304}
305 305
306///////////////////////////////////////////////////////////////////////////// 306/////////////////////////////////////////////////////////////////////////////
307 307
308#define IOM_CLASS "urxvt"
309#include <iom_perl.h> 308#include "iom_perl.h"
310 309
311///////////////////////////////////////////////////////////////////////////// 310/////////////////////////////////////////////////////////////////////////////
312 311
313struct rxvt_perl_interp rxvt_perl; 312struct rxvt_perl_interp rxvt_perl;
314 313
… …
318{ 317{
319 if (perl) 318 if (perl)
320 { 319 {
321 perl_destruct (perl); 320 perl_destruct (perl);
322 perl_free (perl); 321 perl_free (perl);
322 PERL_SYS_TERM ();
323 } 323 }
324} 324}
325 325
326void 326void
327rxvt_perl_interp::init (rxvt_term *term) 327rxvt_perl_interp::init (rxvt_term *term)
328{ 328{
329 if (!perl) 329 if (!perl)
330 { 330 {
331 rxvt_push_locale (""); // perl init destroys current locale 331 rxvt_push_locale (""); // perl init destroys current locale
332 332
333 {
333 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
334 swap (perl_environ, environ); 335 localise_env set_environ (perl_environ);
335 336
336 char *argv[] = { 337 char *args[] = {
337 "", 338 "",
338 "-e" 339 "-e"
339 "BEGIN {" 340 "BEGIN {"
340 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
341 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
342 "}" 343 "}"
343 "" 344 ""
344 "use urxvt;" 345 "use urxvt;"
345 }; 346 };
347 int argc = ecb_array_length (args);
348 char **argv = args;
346 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
347 perl = perl_alloc (); 351 perl = perl_alloc ();
348 perl_construct (perl); 352 perl_construct (perl);
349 353
350 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
351 || perl_run (perl)) 355 || perl_run (perl))
352 { 356 {
353 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
354 358
355 perl_destruct (perl); 359 perl_destruct (perl);
356 perl_free (perl); 360 perl_free (perl);
357 perl = 0; 361 perl = 0;
358 } 362 }
359 363 }
360 swap (perl_environ, environ);
361 364
362 rxvt_pop_locale (); 365 rxvt_pop_locale ();
363 } 366 }
364 367
365 if (perl) 368 if (perl)
366 { 369 {
367 // runs outside of perls ENV 370 // runs outside of perls ENV
368 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 371 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); 372 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
373 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
370 } 374 }
371} 375}
372 376
373static void 377static void
374ungrab (rxvt_term *THIS) 378ungrab (rxvt_term *THIS)
… …
385rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 389rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
386{ 390{
387 if (!perl || !term->perl.self) 391 if (!perl || !term->perl.self)
388 return false; 392 return false;
389 393
394 localise_env set_environ (perl_environ);
395
390 // pre-handling of some events 396 // pre-handling of some events
391 if (htype == HOOK_REFRESH_END) 397 if (htype == HOOK_REFRESH_END)
392 { 398 {
393 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 399 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
394 400
395 for (int i = 0; i <= AvFILL (av); i++) 401 for (int i = 0; i <= AvFILL (av); i++)
396 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 402 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
397 } 403 }
404 else if (htype == HOOK_DESTROY)
405 {
406 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
398 407
399 swap (perl_environ, environ); 408 for (int i = AvFILL (av); i >= 0; i--)
409 {
410 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
411 delete req;
412 }
413 }
400 414
401 bool event_consumed; 415 bool event_consumed;
402 416
403 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 417 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
404 || term->perl.should_invoke [htype]) 418 || term->perl.should_invoke [htype])
405 try
406 { 419 {
407 dSP; 420 dSP;
408 va_list ap; 421 va_list ap;
409 422
410 va_start (ap, htype); 423 va_start (ap, htype);
411 424
412 ENTER; 425 ENTER;
413 SAVETMPS; 426 SAVETMPS;
414 427
415 PUSHMARK (SP); 428 PUSHMARK (SP);
416 429
430 EXTEND (SP, 2);
417 XPUSHs (sv_2mortal (newSVterm (term))); 431 PUSHs (sv_2mortal (newSVterm (term)));
418 XPUSHs (sv_2mortal (newSViv (htype))); 432 PUSHs (sv_2mortal (newSViv (htype)));
419 433
420 for (;;) { 434 for (;;) {
421 data_type dt = (data_type)va_arg (ap, int); 435 data_type dt = (data_type)va_arg (ap, int);
422 436
423 switch (dt) 437 switch (dt)
424 { 438 {
425 case DT_INT: 439 case DT_INT:
426 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 440 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
427 break; 441 break;
428 442
429 case DT_LONG: 443 case DT_LONG:
430 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 444 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
431 break; 445 break;
432 446
433 case DT_STR: 447 case DT_STR:
434 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 448 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
435 break; 449 break;
436 450
437 case DT_STR_LEN: 451 case DT_STR_LEN:
438 { 452 {
439 char *str = va_arg (ap, char *); 453 char *str = va_arg (ap, char *);
440 int len = va_arg (ap, int); 454 int len = va_arg (ap, int);
441 455
442 XPUSHs (sv_2mortal (newSVpvn (str, len))); 456 XPUSHs (sv_2mortal (newSVpvn (str, len)));
443 } 457 }
444 break; 458 break;
445 459
446 case DT_WCS_LEN: 460 case DT_WCS_LEN:
447 { 461 {
448 wchar_t *wstr = va_arg (ap, wchar_t *); 462 wchar_t *wstr = va_arg (ap, wchar_t *);
449 int wlen = va_arg (ap, int); 463 int wlen = va_arg (ap, int);
450 464
451 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 465 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
452 } 466 }
453 break; 467 break;
454 468
455 case DT_LCS_LEN: 469 case DT_LCS_LEN:
456 { 470 {
457 long *lstr = va_arg (ap, long *); 471 long *lstr = va_arg (ap, long *);
458 int llen = va_arg (ap, int); 472 int llen = va_arg (ap, int);
459 473
460 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 474 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
461 } 475 }
462 break; 476 break;
463 477
464 case DT_XEVENT: 478 case DT_XEVENT:
465 { 479 {
466 XEvent *xe = va_arg (ap, XEvent *); 480 XEvent *xe = va_arg (ap, XEvent *);
467 HV *hv = newHV (); 481 HV *hv = newHV ();
468 482
469# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 483# 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) 484# 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) 485# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
472# undef set 486# undef set
473 487
474 setiv (type, xe->type); 488 setiv (type, xe->type);
475 setiv (send_event, xe->xany.send_event); 489 setiv (send_event, xe->xany.send_event);
476 setiv (serial, xe->xany.serial); 490 setiv (serial, xe->xany.serial);
477 491
478 switch (xe->type) 492 switch (xe->type)
479 { 493 {
480 case KeyPress: 494 case KeyPress:
481 case KeyRelease: 495 case KeyRelease:
482 case ButtonPress: 496 case ButtonPress:
483 case ButtonRelease: 497 case ButtonRelease:
484 case MotionNotify: 498 case MotionNotify:
485 setuv (window, xe->xmotion.window); 499 setuv (window, xe->xmotion.window);
486 setuv (root, xe->xmotion.root); 500 setuv (root, xe->xmotion.root);
487 setuv (subwindow, xe->xmotion.subwindow); 501 setuv (subwindow, xe->xmotion.subwindow);
488 setuv (time, xe->xmotion.time); 502 setuv (time, xe->xmotion.time);
489 setiv (x, xe->xmotion.x); 503 setiv (x, xe->xmotion.x);
490 setiv (y, xe->xmotion.y); 504 setiv (y, xe->xmotion.y);
491 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 505 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
492 setiv (col, xe->xmotion.x / term->fwidth); 506 setiv (col, xe->xmotion.x / term->fwidth);
493 setiv (x_root, xe->xmotion.x_root); 507 setiv (x_root, xe->xmotion.x_root);
494 setiv (y_root, xe->xmotion.y_root); 508 setiv (y_root, xe->xmotion.y_root);
495 setuv (state, xe->xmotion.state); 509 setuv (state, xe->xmotion.state);
496 510
497 switch (xe->type) 511 switch (xe->type)
498 { 512 {
499 case KeyPress: 513 case KeyPress:
500 case KeyRelease: 514 case KeyRelease:
501 setuv (keycode, xe->xkey.keycode); 515 setuv (keycode, xe->xkey.keycode);
502 break; 516 break;
503 517
504 case ButtonPress: 518 case ButtonPress:
505 case ButtonRelease: 519 case ButtonRelease:
506 setuv (button, xe->xbutton.button); 520 setuv (button, xe->xbutton.button);
507 break; 521 break;
508 522
509 case MotionNotify: 523 case MotionNotify:
510 setiv (is_hint, xe->xmotion.is_hint); 524 setiv (is_hint, xe->xmotion.is_hint);
511 break; 525 break;
512 } 526 }
513 527
514 break; 528 break;
515 529
516 case MapNotify: 530 case MapNotify:
517 case UnmapNotify: 531 case UnmapNotify:
518 case ConfigureNotify: 532 case ConfigureNotify:
519 setuv (event, xe->xconfigure.event); 533 setuv (event, xe->xconfigure.event);
520 setuv (window, xe->xconfigure.window); 534 setuv (window, xe->xconfigure.window);
521 535
522 switch (xe->type) 536 switch (xe->type)
523 { 537 {
524 case ConfigureNotify: 538 case ConfigureNotify:
525 setiv (x, xe->xconfigure.x); 539 setiv (x, xe->xconfigure.x);
526 setiv (y, xe->xconfigure.y); 540 setiv (y, xe->xconfigure.y);
527 setiv (width, xe->xconfigure.width); 541 setiv (width, xe->xconfigure.width);
528 setiv (height, xe->xconfigure.height); 542 setiv (height, xe->xconfigure.height);
529 setuv (above, xe->xconfigure.above); 543 setuv (above, xe->xconfigure.above);
530 break; 544 break;
531 } 545 }
532 546
533 break; 547 break;
534 548
535 case PropertyNotify: 549 case PropertyNotify:
536 setuv (window, xe->xproperty.window); 550 setuv (window, xe->xproperty.window);
537 setuv (atom, xe->xproperty.atom); 551 setuv (atom, xe->xproperty.atom);
538 setuv (time, xe->xproperty.time); 552 setuv (time, xe->xproperty.time);
539 setiv (state, xe->xproperty.state); 553 setiv (state, xe->xproperty.state);
540 break; 554 break;
541 555
542 case ClientMessage: 556 case ClientMessage:
543 setuv (window, xe->xclient.window); 557 setuv (window, xe->xclient.window);
544 setuv (message_type, xe->xclient.message_type); 558 setuv (message_type, xe->xclient.message_type);
545 setuv (format, xe->xclient.format); 559 setuv (format, xe->xclient.format);
546 setuv (l0, xe->xclient.data.l[0]); 560 setuv (l0, xe->xclient.data.l[0]);
547 setuv (l1, xe->xclient.data.l[1]); 561 setuv (l1, xe->xclient.data.l[1]);
548 setuv (l2, xe->xclient.data.l[2]); 562 setuv (l2, xe->xclient.data.l[2]);
549 setuv (l3, xe->xclient.data.l[3]); 563 setuv (l3, xe->xclient.data.l[3]);
550 setuv (l4, xe->xclient.data.l[4]); 564 setuv (l4, xe->xclient.data.l[4]);
551 break; 565 break;
552 } 566 }
553 567
554 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 568 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
555 } 569 }
556 break; 570 break;
557 571
558 case DT_END: 572 case DT_END:
559 goto call; 573 goto call;
560 574
561 default: 575 default:
562 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 576 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
563 } 577 }
578 }
579
580 call:
581 va_end (ap);
582
583 PUTBACK;
584 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
585 SPAGAIN;
586
587 if (count)
588 {
589 SV *status = POPs;
590 count = SvTRUE (status);
564 } 591 }
565 592
566 call:
567 va_end (ap);
568
569 PUTBACK; 593 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; 594 FREETMPS;
581 LEAVE; 595 LEAVE;
582 596
583 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
584 { 598 {
585 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 599 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
586 ungrab (term); // better lose the grab than the session 600 ungrab (term); // better lose the grab than the session
587 } 601 }
588 602
589 event_consumed = !!count; 603 event_consumed = !!count;
590 } 604 }
591 catch (...)
592 {
593 swap (perl_environ, environ);
594 throw;
595 }
596 else 605 else
597 event_consumed = false; 606 event_consumed = false;
598 607
599 // post-handling of some events 608 // post-handling of some events
600 if (htype == HOOK_REFRESH_BEGIN) 609 if (htype == HOOK_REFRESH_BEGIN)
601 { 610 {
602 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 611 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
603 612
604 for (int i = AvFILL (av); i >= 0; i--) 613 for (int i = AvFILL (av); i >= 0; i--)
605 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 614 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
606 } 615 }
607 else if (htype == HOOK_DESTROY) 616 else if (htype == HOOK_DESTROY)
608 { 617 {
609 clearSVptr ((SV *)term->perl.self); 618 clearSVptr ((SV *)term->perl.self);
610 SvREFCNT_dec ((SV *)term->perl.self); 619 SvREFCNT_dec ((SV *)term->perl.self);
611 620
612 // don't allow further calls 621 // don't allow further calls
613 term->perl.self = 0; 622 term->perl.self = 0;
614 } 623 }
615 624
616 swap (perl_environ, environ);
617
618 return event_consumed; 625 return event_consumed;
626}
627
628void
629rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
630{
631 localise_env set_environ (perl_environ);
632
633 ENTER;
634 SAVETMPS;
635
636 dSP;
637 XPUSHs (sv_2mortal (newSVpvn (data, len)));
638 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
639
640 if (SvTRUE (ERRSV))
641 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
642
643 FREETMPS;
644 LEAVE;
619} 645}
620 646
621///////////////////////////////////////////////////////////////////////////// 647/////////////////////////////////////////////////////////////////////////////
622 648
623MODULE = urxvt PACKAGE = urxvt 649MODULE = urxvt PACKAGE = urxvt
… …
635# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 661# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
636# include "hookinc.h" 662# include "hookinc.h"
637# undef def 663# undef def
638 664
639 HV *option = get_hv ("urxvt::OPTION", 1); 665 HV *option = get_hv ("urxvt::OPTION", 1);
640# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 666# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
641# define nodef(name) 667# define nodef(name)
642# include "optinc.h" 668# include "optinc.h"
643# undef nodef 669# undef nodef
644# undef def 670# undef def
645 671
… …
647 static const struct { 673 static const struct {
648 const char *name; 674 const char *name;
649 IV iv; 675 IV iv;
650 } *civ, const_iv[] = { 676 } *civ, const_iv[] = {
651# define const_iv(name) { # name, (IV)name } 677# define const_iv(name) { # name, (IV)name }
678 const_iv (NUM_RESOURCES),
652 const_iv (DEFAULT_RSTYLE), 679 const_iv (DEFAULT_RSTYLE),
653 const_iv (OVERLAY_RSTYLE), 680 const_iv (OVERLAY_RSTYLE),
681 const_iv (Color_Bits),
682 const_iv (RS_bgShift), const_iv (RS_bgMask),
683 const_iv (RS_fgShift), const_iv (RS_fgMask),
684 const_iv (RS_Careful),
685 const_iv (RS_fontCount),
686 const_iv (RS_fontShift),
687 const_iv (RS_fontMask),
688 const_iv (RS_baseattrMask),
689 const_iv (RS_attrMask),
690 const_iv (RS_redraw),
691 const_iv (RS_Sel),
654 const_iv (RS_Bold), 692 const_iv (RS_Bold),
655 const_iv (RS_Italic), 693 const_iv (RS_Italic),
656 const_iv (RS_Blink), 694 const_iv (RS_Blink),
657 const_iv (RS_RVid), 695 const_iv (RS_RVid),
658 const_iv (RS_Uline), 696 const_iv (RS_Uline),
… …
674 const_iv (AnyModifier), 712 const_iv (AnyModifier),
675 713
676 const_iv (NoSymbol), 714 const_iv (NoSymbol),
677 const_iv (GrabModeSync), 715 const_iv (GrabModeSync),
678 const_iv (GrabModeAsync), 716 const_iv (GrabModeAsync),
679
680 const_iv (EVENT_NONE),
681 const_iv (EVENT_READ),
682 const_iv (EVENT_WRITE),
683 717
684 const_iv (NoEventMask), 718 const_iv (NoEventMask),
685 const_iv (KeyPressMask), 719 const_iv (KeyPressMask),
686 const_iv (KeyReleaseMask), 720 const_iv (KeyReleaseMask),
687 const_iv (ButtonPressMask), 721 const_iv (ButtonPressMask),
… …
766 const_iv (XIMDontChange), 800 const_iv (XIMDontChange),
767# endif 801# endif
768# endif 802# endif
769 }; 803 };
770 804
771 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 805 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
772 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 806 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
773} 807}
774 808
775void 809void
776warn (const char *msg) 810warn (const char *msg)
777 CODE: 811 CODE:
… …
786_exit (int status) 820_exit (int status)
787 821
788NV 822NV
789NOW () 823NOW ()
790 CODE: 824 CODE:
791 RETVAL = NOW; 825 RETVAL = ev::now ();
792 OUTPUT: 826 OUTPUT:
793 RETVAL 827 RETVAL
794 828
795int 829int
796GET_BASEFG (int rend) 830GET_BASEFG (int rend)
… …
849 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 883 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
850 if ((*t)->perl.self) 884 if ((*t)->perl.self)
851 PUSHs (sv_2mortal (newSVterm (*t))); 885 PUSHs (sv_2mortal (newSVterm (*t)));
852} 886}
853 887
888IV
889_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
890 CODE:
891 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
892 req->cb_sv = newSVsv (cb);
893 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
894 av_push (av, newSViv ((IV)req));
895 RETVAL = (IV)req;
896 OUTPUT:
897 RETVAL
898
899void
900_delete_selection_request (IV req_)
901 CODE:
902 rxvt_selection *req = (rxvt_selection *)req_;
903 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
904 int i;
905
906 for (i = AvFILL (av); i >= 0; i--)
907 if (SvIV (*av_fetch (av, i, 1)) == req_)
908 break;
909
910 for (; i < AvFILL (av); i++)
911 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
912
913 av_pop (av);
914
915 delete req;
916
854MODULE = urxvt PACKAGE = urxvt::term 917MODULE = urxvt PACKAGE = urxvt::term
855 918
856SV * 919SV *
857_new (AV *env, AV *arg) 920_new (AV *env, AV *arg)
858 CODE: 921 CODE:
859{ 922{
860 rxvt_term *term = new rxvt_term; 923 rxvt_term *term = new rxvt_term;
861 924
862 stringvec *argv = new stringvec; 925 stringvec *argv = new stringvec;
863 stringvec *envv = new stringvec;
864
865 for (int i = 0; i <= AvFILL (arg); i++) 926 for (int i = 0; i <= AvFILL (arg); i++)
866 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 927 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
867 928
929 stringvec *envv = new stringvec;
868 for (int i = AvFILL (env) + 1; i--; ) 930 for (int i = AvFILL (env) + 1; i--; )
869 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 931 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
870 932
871 envv->push_back (0);
872
873 bool success;
874
875 try 933 try
876 { 934 {
877 success = term->init (argv, envv); 935 term->init (argv, envv);
878 } 936 }
879 catch (const class rxvt_failure_exception &e) 937 catch (const class rxvt_failure_exception &e)
880 {
881 success = false;
882 }
883
884 if (!success)
885 { 938 {
886 term->destroy (); 939 term->destroy ();
887 croak ("error while initializing new terminal instance"); 940 croak ("error while initializing new terminal instance");
888 } 941 }
889 942
… …
923 976
924void 977void
925rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 978rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
926 CODE: 979 CODE:
927 XUngrabKey (THIS->dpy, keycode, modifiers, window); 980 XUngrabKey (THIS->dpy, keycode, modifiers, window);
928
929void
930rxvt_term::XUngrabKeyboard (Time eventtime)
931 CODE:
932 XUngrabKeyboard (THIS->dpy, eventtime);
933 981
934bool 982bool
935rxvt_term::grab (Time eventtime, int sync = 0) 983rxvt_term::grab (Time eventtime, int sync = 0)
936 CODE: 984 CODE:
937{ 985{
… …
1052 free (wstr); 1100 free (wstr);
1053} 1101}
1054 OUTPUT: 1102 OUTPUT:
1055 RETVAL 1103 RETVAL
1056 1104
1057char *
1058rxvt_term::locale ()
1059 CODE:
1060 RETVAL = THIS->locale;
1061 OUTPUT:
1062 RETVAL
1063
1064#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1105#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1065 1106
1066#define TERM_OFFSET_width TERM_OFFSET(width) 1107#define TERM_OFFSET_width TERM_OFFSET(width)
1067#define TERM_OFFSET_height TERM_OFFSET(height) 1108#define TERM_OFFSET_height TERM_OFFSET(height)
1068#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1109#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1069#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1110#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1070#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1111#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1071#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1112#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1072#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1113#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1073#define TERM_OFFSET_focus TERM_OFFSET(focus) 1114#define TERM_OFFSET_focus TERM_OFFSET(focus)
1074#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1115#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1075#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1116#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1076#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1117#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1077#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1118#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1119#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1078#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1120#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1079#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1121#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1080#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1122#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1081 1123
1082int 1124int
1083rxvt_term::width () 1125rxvt_term::width ()
1084 ALIAS: 1126 ALIAS:
1085 width = TERM_OFFSET_width 1127 width = TERM_OFFSET_width
1086 height = TERM_OFFSET_height 1128 height = TERM_OFFSET_height
1087 fwidth = TERM_OFFSET_fwidth 1129 fwidth = TERM_OFFSET_fwidth
1088 fheight = TERM_OFFSET_fheight 1130 fheight = TERM_OFFSET_fheight
1089 fbase = TERM_OFFSET_fbase 1131 fbase = TERM_OFFSET_fbase
1090 nrow = TERM_OFFSET_nrow 1132 nrow = TERM_OFFSET_nrow
1091 ncol = TERM_OFFSET_ncol 1133 ncol = TERM_OFFSET_ncol
1092 focus = TERM_OFFSET_focus 1134 focus = TERM_OFFSET_focus
1093 mapped = TERM_OFFSET_mapped 1135 mapped = TERM_OFFSET_mapped
1094 int_bwidth = TERM_OFFSET_int_bwidth 1136 int_bwidth = TERM_OFFSET_int_bwidth
1095 ext_bwidth = TERM_OFFSET_ext_bwidth 1137 ext_bwidth = TERM_OFFSET_ext_bwidth
1096 lineSpace = TERM_OFFSET_lineSpace 1138 lineSpace = TERM_OFFSET_lineSpace
1139 letterSpace = TERM_OFFSET_letterSpace
1097 saveLines = TERM_OFFSET_saveLines 1140 saveLines = TERM_OFFSET_saveLines
1098 total_rows = TERM_OFFSET_total_rows 1141 total_rows = TERM_OFFSET_total_rows
1099 top_row = TERM_OFFSET_top_row 1142 top_row = TERM_OFFSET_top_row
1100 CODE: 1143 CODE:
1101 RETVAL = *(int *)((char *)THIS + ix); 1144 RETVAL = *(int *)((char *)THIS + ix);
1102 OUTPUT: 1145 OUTPUT:
1103 RETVAL 1146 RETVAL
1104 1147
… …
1115 { 1158 {
1116 case 0: RETVAL = THIS->ModLevel3Mask; break; 1159 case 0: RETVAL = THIS->ModLevel3Mask; break;
1117 case 1: RETVAL = THIS->ModMetaMask; break; 1160 case 1: RETVAL = THIS->ModMetaMask; break;
1118 case 2: RETVAL = THIS->ModNumLockMask; break; 1161 case 2: RETVAL = THIS->ModNumLockMask; break;
1119 case 3: RETVAL = THIS->current_screen; break; 1162 case 3: RETVAL = THIS->current_screen; break;
1163#ifdef CURSOR_BLINK
1120 case 4: RETVAL = THIS->hidden_cursor; break; 1164 case 4: RETVAL = THIS->hidden_cursor; break;
1165#endif
1121 } 1166 }
1122 OUTPUT: 1167 OUTPUT:
1123 RETVAL 1168 RETVAL
1124 1169
1125char * 1170char *
… …
1150 if (*i) 1195 if (*i)
1151 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1196 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1152} 1197}
1153 1198
1154int 1199int
1155rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1200rxvt_term::pty_ev_events (int events = ev::UNDEF)
1156 CODE: 1201 CODE:
1157 RETVAL = THIS->pty_ev.events; 1202 RETVAL = THIS->pty_ev.events;
1158 if (events != EVENT_UNDEF) 1203 if (events != ev::UNDEF)
1159 THIS->pty_ev.set (events); 1204 THIS->pty_ev.set (events);
1160 OUTPUT: 1205 OUTPUT:
1161 RETVAL 1206 RETVAL
1162 1207
1163int 1208int
… …
1168 RETVAL 1213 RETVAL
1169 1214
1170Window 1215Window
1171rxvt_term::parent () 1216rxvt_term::parent ()
1172 CODE: 1217 CODE:
1173 RETVAL = THIS->parent [0]; 1218 RETVAL = THIS->parent;
1174 OUTPUT: 1219 OUTPUT:
1175 RETVAL 1220 RETVAL
1176 1221
1177Window 1222Window
1178rxvt_term::vt () 1223rxvt_term::vt ()
… …
1205 if (newval <= 0) 1250 if (newval <= 0)
1206 THIS->scr_changeview (max (newval, THIS->top_row)); 1251 THIS->scr_changeview (max (newval, THIS->top_row));
1207} 1252}
1208 OUTPUT: 1253 OUTPUT:
1209 RETVAL 1254 RETVAL
1255
1256void
1257rxvt_term::set_urgency (bool enable)
1210 1258
1211void 1259void
1212rxvt_term::focus_in () 1260rxvt_term::focus_in ()
1213 1261
1214void 1262void
… …
1242 1290
1243void 1291void
1244rxvt_term::want_refresh () 1292rxvt_term::want_refresh ()
1245 CODE: 1293 CODE:
1246 THIS->want_refresh = 1; 1294 THIS->want_refresh = 1;
1295 THIS->refresh_check ();
1247 1296
1248void 1297void
1249rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1298rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1250 PPCODE: 1299 PPCODE:
1251{ 1300{
… …
1406SV * 1455SV *
1407rxvt_term::special_decode (SV *text) 1456rxvt_term::special_decode (SV *text)
1408 CODE: 1457 CODE:
1409{ 1458{
1410 wchar_t *wstr = sv2wcs (text); 1459 wchar_t *wstr = sv2wcs (text);
1411 int wlen = wcslen (wstr);
1412 int dlen = 0; 1460 int dlen = 0;
1413 1461
1414 // find length 1462 // find length
1415 for (wchar_t *s = wstr; *s; s++) 1463 for (wchar_t *s = wstr; *s; s++)
1416 if (*s == NOCHAR) 1464 if (*s == NOCHAR)
… …
1447# include "rsinc.h" 1495# include "rsinc.h"
1448# undef def 1496# undef def
1449# undef reserve 1497# undef reserve
1450 }; 1498 };
1451 1499
1452 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1500 rs = rslist + ecb_array_length (rslist);
1453 1501
1502 if (*name)
1454 do { 1503 {
1504 do {
1455 if (rs-- == rslist) 1505 if (rs-- == rslist)
1456 croak ("no such resource '%s', requested", name); 1506 croak ("no such resource '%s', requested", name);
1457 } while (strcmp (name, rs->name)); 1507 } while (strcmp (name, rs->name));
1458 1508
1459 index += rs->value; 1509 index += rs->value;
1510 }
1511 else
1512 {
1513 --rs;
1514 name = "";
1515 }
1460 1516
1461 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1517 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1462 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1518 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1463 1519
1464 if (GIMME_V != G_VOID) 1520 if (GIMME_V != G_VOID)
… …
1479 1535
1480const char * 1536const char *
1481rxvt_term::x_resource (const char *name) 1537rxvt_term::x_resource (const char *name)
1482 1538
1483bool 1539bool
1484rxvt_term::option (U32 optval, int set = -1) 1540rxvt_term::option (U8 optval, int set = -1)
1485 CODE: 1541 CODE:
1486{ 1542{
1487 RETVAL = THIS->options & optval; 1543 RETVAL = THIS->option (optval);
1488 1544
1489 if (set >= 0) 1545 if (set >= 0)
1490 { 1546 {
1491 if (set)
1492 THIS->options |= optval; 1547 THIS->set_option (optval, set);
1493 else
1494 THIS->options &= ~optval;
1495 1548
1496 if (THIS->check_ev.is_active ()) // avoid doing this before START 1549 if (THIS->init_done) // avoid doing this before START
1497 switch (optval) 1550 switch (optval)
1498 { 1551 {
1499 case Opt_skipBuiltinGlyphs: 1552 case Opt_skipBuiltinGlyphs:
1500 THIS->set_fonts (); 1553 THIS->set_fonts ();
1501 THIS->scr_remap_chars (); 1554 THIS->scr_remap_chars ();
1502 THIS->scr_touch (true); 1555 THIS->scr_touch (true);
1503 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1557 THIS->refresh_check ();
1504 break; 1558 break;
1559
1560#ifdef CURSOR_BLINK
1561 case Opt_cursorBlink:
1562 THIS->cursor_blink_reset ();
1563 break;
1564#endif
1505 1565
1506 case Opt_cursorUnderline: 1566 case Opt_cursorUnderline:
1507 THIS->want_refresh = 1; 1567 THIS->want_refresh = 1;
1568 THIS->refresh_check ();
1508 break; 1569 break;
1509 1570
1510# case Opt_scrollBar_floating: 1571# case Opt_scrollBar_floating:
1511# case Opt_scrollBar_right: 1572# case Opt_scrollBar_right:
1512# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1573# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1522 CODE: 1583 CODE:
1523 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1584 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1524 THIS->keyboard->register_done (); 1585 THIS->keyboard->register_done ();
1525 OUTPUT: 1586 OUTPUT:
1526 RETVAL 1587 RETVAL
1588
1589void
1590rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1591 CODE:
1592 wchar_t *wstr = sv2wcs (str);
1593 THIS->keyboard->register_user_translation (keysym, state, wstr);
1594 free (wstr);
1527 1595
1528void 1596void
1529rxvt_term::screen_cur (...) 1597rxvt_term::screen_cur (...)
1530 PROTOTYPE: $;$$ 1598 PROTOTYPE: $;$$
1531 ALIAS: 1599 ALIAS:
… …
1545 EXTEND (SP, 2); 1613 EXTEND (SP, 2);
1546 PUSHs (sv_2mortal (newSViv (rc.row))); 1614 PUSHs (sv_2mortal (newSViv (rc.row)));
1547 PUSHs (sv_2mortal (newSViv (rc.col))); 1615 PUSHs (sv_2mortal (newSViv (rc.col)));
1548 } 1616 }
1549 1617
1550 if (items == 3) 1618 if (items >= 3)
1551 { 1619 {
1552 rc.row = SvIV (ST (1)); 1620 rc.row = SvIV (ST (1));
1553 rc.col = SvIV (ST (2)); 1621 rc.col = SvIV (ST (2));
1554 1622
1555 if (ix == 2) 1623 if (ix == 2)
… …
1570 1638
1571 clamp_it (rc.col, 0, THIS->ncol); 1639 clamp_it (rc.col, 0, THIS->ncol);
1572 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1640 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1573 1641
1574 if (ix) 1642 if (ix)
1643 {
1644 THIS->selection.screen = THIS->current_screen;
1645
1575 THIS->want_refresh = 1; 1646 THIS->want_refresh = 1;
1647 THIS->refresh_check ();
1576 } 1648 }
1649 }
1577} 1650}
1578 1651
1579char 1652int
1580rxvt_term::cur_charset () 1653rxvt_term::selection_screen (int screen = -1)
1581 CODE: 1654 CODE:
1582 RETVAL = THIS->charsets [THIS->screen.charset]; 1655 RETVAL = THIS->selection.screen;
1583 OUTPUT: 1656 if (screen >= 0)
1657 THIS->selection.screen = screen;
1658 OUTPUT:
1584 RETVAL 1659 RETVAL
1585 1660
1586void 1661void
1587rxvt_term::selection_clear () 1662rxvt_term::selection_clear (bool clipboard = false)
1588 1663
1589void 1664void
1590rxvt_term::selection_make (Time eventtime, bool rect = false) 1665rxvt_term::selection_make (Time eventtime, bool rect = false)
1591 CODE: 1666 CODE:
1592 THIS->selection.op = SELECTION_CONT; 1667 THIS->selection.op = SELECTION_CONT;
1593 THIS->selection.rect = rect; 1668 THIS->selection.rect = rect;
1594 THIS->selection_make (eventtime); 1669 THIS->selection_make (eventtime);
1595 1670
1596int 1671int
1597rxvt_term::selection_grab (Time eventtime) 1672rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1598 1673
1599void 1674void
1600rxvt_term::selection (SV *newtext = 0) 1675rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1601 PPCODE: 1676 PPCODE:
1602{ 1677{
1678 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1679 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1680
1603 if (GIMME_V != G_VOID) 1681 if (GIMME_V != G_VOID)
1604 XPUSHs (THIS->selection.text 1682 XPUSHs (text
1605 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1683 ? sv_2mortal (wcs2sv (text, len))
1606 : &PL_sv_undef); 1684 : &PL_sv_undef);
1607 1685
1608 if (newtext) 1686 if (newtext)
1609 { 1687 {
1610 free (THIS->selection.text); 1688 free (text);
1611 1689
1612 THIS->selection.text = sv2wcs (newtext); 1690 text = sv2wcs (newtext);
1613 THIS->selection.len = wcslen (THIS->selection.text); 1691 len = wcslen (text);
1614 } 1692 }
1615} 1693}
1694
1695char
1696rxvt_term::cur_charset ()
1697 CODE:
1698 RETVAL = THIS->charsets [THIS->screen.charset];
1699 OUTPUT:
1700 RETVAL
1616 1701
1617void 1702void
1618rxvt_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) 1703rxvt_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)
1619 1704
1620void 1705void
… …
1642 char *str = SvPVbyte (octets, len); 1727 char *str = SvPVbyte (octets, len);
1643 C_ARGS: 1728 C_ARGS:
1644 str, len 1729 str, len
1645 1730
1646void 1731void
1732rxvt_term::tt_paste (SV *octets)
1733 INIT:
1734 STRLEN len;
1735 char *str = SvPVbyte (octets, len);
1736 C_ARGS:
1737 str, len
1738
1739void
1647rxvt_term::cmd_parse (SV *octets) 1740rxvt_term::cmd_parse (SV *octets)
1648 CODE: 1741 CODE:
1649{ 1742{
1650 STRLEN len; 1743 STRLEN len;
1651 char *str = SvPVbyte (octets, len); 1744 char *str = SvPVbyte (octets, len);
… …
1687 Atom *props = XListProperties (THIS->dpy, window, &count); 1780 Atom *props = XListProperties (THIS->dpy, window, &count);
1688 1781
1689 EXTEND (SP, count); 1782 EXTEND (SP, count);
1690 while (count--) 1783 while (count--)
1691 PUSHs (newSVuv ((U32)props [count])); 1784 PUSHs (newSVuv ((U32)props [count]));
1692 1785
1693 XFree (props); 1786 XFree (props);
1694} 1787}
1695 1788
1696void 1789void
1697rxvt_term::XGetWindowProperty (Window window, Atom property) 1790rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1720 XFree (prop); 1813 XFree (prop);
1721 } 1814 }
1722} 1815}
1723 1816
1724void 1817void
1725rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1818rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1726 CODE: 1819 CODE:
1727{ 1820{
1728 STRLEN len; 1821 STRLEN len;
1729 char *data_ = SvPVbyte (data, len); 1822 char *data_ = SvPVbyte (data, len);
1730 1823

Diff Legend

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