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

Diff Legend

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