ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtperl.xs
(Generate patch)

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

Diff Legend

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