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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.115 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.146 by sf-exg, Mon Dec 5 12:52:57 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)]
… …
111 107
112///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
113 109
114#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
115 111
116class overlay { 112class overlay : overlay_base
113{
117 rxvt_term *THIS; 114 rxvt_term *THIS;
118 AV *overlay_av; 115 AV *overlay_av;
119 int x, y, w, h;
120 int border; 116 int border;
121 text_t **text;
122 rend_t **rend;
123 117
124public: 118public:
125 HV *self; 119 HV *self;
126 120
127 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);
… …
134 128
135 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
136}; 130};
137 131
138overlay::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)
139: 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)
140{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
141 if (w < 0) w = 0; 140 if (w < 0) w = 0;
142 if (h < 0) h = 0; 141 if (h < 0) h = 0;
143 142
144 if (border == 2) 143 if (border == 2)
145 { 144 {
… …
214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 213 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
215 )); 214 ));
216 av_push (overlay_av, newSViv ((long)this)); 215 av_push (overlay_av, newSViv ((long)this));
217 216
218 THIS->want_refresh = 1; 217 THIS->want_refresh = 1;
218 THIS->refresh_check ();
219} 219}
220 220
221void 221void
222overlay::hide () 222overlay::hide ()
223{ 223{
… …
237 237
238 SvREFCNT_dec (overlay_av); 238 SvREFCNT_dec (overlay_av);
239 overlay_av = 0; 239 overlay_av = 0;
240 240
241 THIS->want_refresh = 1; 241 THIS->want_refresh = 1;
242 THIS->refresh_check ();
242} 243}
243 244
244void overlay::swap () 245void overlay::swap ()
245{ 246{
246 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));
247 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));
248 249
249 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
250 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;
251 257
252 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
253 { 259 {
254 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
255 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
… …
291 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 297 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
292 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 298 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
293 } 299 }
294 300
295 THIS->want_refresh = 1; 301 THIS->want_refresh = 1;
302 THIS->refresh_check ();
296} 303}
297 304
298///////////////////////////////////////////////////////////////////////////// 305/////////////////////////////////////////////////////////////////////////////
299 306
300#define IOM_CLASS "urxvt"
301#define IOM_WARN rxvt_warn
302#include <iom_perl.h> 307#include "iom_perl.h"
303 308
304///////////////////////////////////////////////////////////////////////////// 309/////////////////////////////////////////////////////////////////////////////
305 310
306struct rxvt_perl_interp rxvt_perl; 311struct rxvt_perl_interp rxvt_perl;
307 312
… …
311{ 316{
312 if (perl) 317 if (perl)
313 { 318 {
314 perl_destruct (perl); 319 perl_destruct (perl);
315 perl_free (perl); 320 perl_free (perl);
321 PERL_SYS_TERM ();
316 } 322 }
317} 323}
318 324
319void 325void
320rxvt_perl_interp::init (rxvt_term *term) 326rxvt_perl_interp::init (rxvt_term *term)
321{ 327{
322 if (!perl) 328 if (!perl)
323 { 329 {
324 rxvt_push_locale (""); // perl init destroys current locale 330 rxvt_push_locale (""); // perl init destroys current locale
325 331
332 {
326 perl_environ = rxvt_environ; 333 perl_environ = rxvt_environ;
327 swap (perl_environ, environ); 334 localise_env set_environ (perl_environ);
328 335
329 char *argv[] = { 336 char *args[] = {
330 "", 337 "",
331 "-e" 338 "-e"
332 "BEGIN {" 339 "BEGIN {"
333 " urxvt->bootstrap;" 340 " urxvt->bootstrap;"
334 " unshift @INC, '" LIBDIR "';" 341 " unshift @INC, '" LIBDIR "';"
335 "}" 342 "}"
336 "" 343 ""
337 "use urxvt;" 344 "use urxvt;"
338 }; 345 };
346 int argc = ecb_array_length (args);
347 char **argv = args;
339 348
349 PERL_SYS_INIT3 (&argc, &argv, &environ);
340 perl = perl_alloc (); 350 perl = perl_alloc ();
341 perl_construct (perl); 351 perl_construct (perl);
342 352
343 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 353 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
344 || perl_run (perl)) 354 || perl_run (perl))
345 { 355 {
346 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 356 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
347 357
348 perl_destruct (perl); 358 perl_destruct (perl);
349 perl_free (perl); 359 perl_free (perl);
350 perl = 0; 360 perl = 0;
351 } 361 }
352 362 }
353 swap (perl_environ, environ);
354 363
355 rxvt_pop_locale (); 364 rxvt_pop_locale ();
356 } 365 }
357 366
358 if (perl) 367 if (perl)
359 { 368 {
360 // runs outside of perls ENV 369 // runs outside of perls ENV
361 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 370 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
362 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 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);
363 } 373 }
364} 374}
365 375
366static void 376static void
367ungrab (rxvt_term *THIS) 377ungrab (rxvt_term *THIS)
… …
378rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 388rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
379{ 389{
380 if (!perl || !term->perl.self) 390 if (!perl || !term->perl.self)
381 return false; 391 return false;
382 392
393 localise_env set_environ (perl_environ);
394
383 // pre-handling of some events 395 // pre-handling of some events
384 if (htype == HOOK_REFRESH_END) 396 if (htype == HOOK_REFRESH_END)
385 { 397 {
386 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));
387 399
388 for (int i = 0; i <= AvFILL (av); i++) 400 for (int i = 0; i <= AvFILL (av); i++)
389 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 401 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
390 } 402 }
403 else if (htype == HOOK_DESTROY)
404 {
405 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
391 406
392 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 }
393 413
394 bool event_consumed; 414 bool event_consumed;
395 415
396 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 416 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
397 || term->perl.should_invoke [htype]) 417 || term->perl.should_invoke [htype])
398 try
399 { 418 {
400 dSP; 419 dSP;
401 va_list ap; 420 va_list ap;
402 421
403 va_start (ap, htype); 422 va_start (ap, htype);
404 423
405 ENTER; 424 ENTER;
406 SAVETMPS; 425 SAVETMPS;
407 426
408 PUSHMARK (SP); 427 PUSHMARK (SP);
409 428
429 EXTEND (SP, 2);
410 XPUSHs (sv_2mortal (newSVterm (term))); 430 PUSHs (sv_2mortal (newSVterm (term)));
411 XPUSHs (sv_2mortal (newSViv (htype))); 431 PUSHs (sv_2mortal (newSViv (htype)));
412 432
413 for (;;) { 433 for (;;) {
414 data_type dt = (data_type)va_arg (ap, int); 434 data_type dt = (data_type)va_arg (ap, int);
415 435
416 switch (dt) 436 switch (dt)
417 { 437 {
418 case DT_INT: 438 case DT_INT:
419 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 439 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
420 break; 440 break;
421 441
422 case DT_LONG: 442 case DT_LONG:
423 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 443 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
424 break; 444 break;
425 445
426 case DT_STR: 446 case DT_STR:
427 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 447 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
428 break; 448 break;
429 449
430 case DT_STR_LEN: 450 case DT_STR_LEN:
431 { 451 {
432 char *str = va_arg (ap, char *); 452 char *str = va_arg (ap, char *);
433 int len = va_arg (ap, int); 453 int len = va_arg (ap, int);
434 454
435 XPUSHs (sv_2mortal (newSVpvn (str, len))); 455 XPUSHs (sv_2mortal (newSVpvn (str, len)));
436 } 456 }
437 break; 457 break;
438 458
439 case DT_WCS_LEN: 459 case DT_WCS_LEN:
440 { 460 {
441 wchar_t *wstr = va_arg (ap, wchar_t *); 461 wchar_t *wstr = va_arg (ap, wchar_t *);
442 int wlen = va_arg (ap, int); 462 int wlen = va_arg (ap, int);
443 463
444 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 464 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
445 } 465 }
446 break; 466 break;
447 467
448 case DT_LCS_LEN: 468 case DT_LCS_LEN:
449 { 469 {
450 long *lstr = va_arg (ap, long *); 470 long *lstr = va_arg (ap, long *);
451 int llen = va_arg (ap, int); 471 int llen = va_arg (ap, int);
452 472
453 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 473 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
454 } 474 }
455 break; 475 break;
456 476
457 case DT_XEVENT: 477 case DT_XEVENT:
458 { 478 {
459 XEvent *xe = va_arg (ap, XEvent *); 479 XEvent *xe = va_arg (ap, XEvent *);
460 HV *hv = newHV (); 480 HV *hv = newHV ();
461 481
462# 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)
463# 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)
464# 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)
465# undef set 485# undef set
466 486
467 setiv (type, xe->type); 487 setiv (type, xe->type);
468 setiv (send_event, xe->xany.send_event); 488 setiv (send_event, xe->xany.send_event);
469 setiv (serial, xe->xany.serial); 489 setiv (serial, xe->xany.serial);
470 490
471 switch (xe->type) 491 switch (xe->type)
472 { 492 {
473 case KeyPress: 493 case KeyPress:
474 case KeyRelease: 494 case KeyRelease:
475 case ButtonPress: 495 case ButtonPress:
476 case ButtonRelease: 496 case ButtonRelease:
477 case MotionNotify: 497 case MotionNotify:
478 setuv (window, xe->xmotion.window); 498 setuv (window, xe->xmotion.window);
479 setuv (root, xe->xmotion.root); 499 setuv (root, xe->xmotion.root);
480 setuv (subwindow, xe->xmotion.subwindow); 500 setuv (subwindow, xe->xmotion.subwindow);
481 setuv (time, xe->xmotion.time); 501 setuv (time, xe->xmotion.time);
482 setiv (x, xe->xmotion.x); 502 setiv (x, xe->xmotion.x);
483 setiv (y, xe->xmotion.y); 503 setiv (y, xe->xmotion.y);
484 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 504 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
485 setiv (col, xe->xmotion.x / term->fwidth); 505 setiv (col, xe->xmotion.x / term->fwidth);
486 setiv (x_root, xe->xmotion.x_root); 506 setiv (x_root, xe->xmotion.x_root);
487 setiv (y_root, xe->xmotion.y_root); 507 setiv (y_root, xe->xmotion.y_root);
488 setuv (state, xe->xmotion.state); 508 setuv (state, xe->xmotion.state);
489 509
490 switch (xe->type) 510 switch (xe->type)
491 { 511 {
492 case KeyPress: 512 case KeyPress:
493 case KeyRelease: 513 case KeyRelease:
494 setuv (keycode, xe->xkey.keycode); 514 setuv (keycode, xe->xkey.keycode);
495 break; 515 break;
496 516
497 case ButtonPress: 517 case ButtonPress:
498 case ButtonRelease: 518 case ButtonRelease:
499 setuv (button, xe->xbutton.button); 519 setuv (button, xe->xbutton.button);
500 break; 520 break;
501 521
502 case MotionNotify: 522 case MotionNotify:
503 setiv (is_hint, xe->xmotion.is_hint); 523 setiv (is_hint, xe->xmotion.is_hint);
504 break; 524 break;
505 } 525 }
506 526
507 break; 527 break;
508 528
509 case MapNotify: 529 case MapNotify:
510 case UnmapNotify: 530 case UnmapNotify:
511 case ConfigureNotify: 531 case ConfigureNotify:
512 setuv (event, xe->xconfigure.event); 532 setuv (event, xe->xconfigure.event);
513 setuv (window, xe->xconfigure.window); 533 setuv (window, xe->xconfigure.window);
514 534
515 switch (xe->type) 535 switch (xe->type)
516 { 536 {
517 case ConfigureNotify: 537 case ConfigureNotify:
518 setiv (x, xe->xconfigure.x); 538 setiv (x, xe->xconfigure.x);
519 setiv (y, xe->xconfigure.y); 539 setiv (y, xe->xconfigure.y);
520 setiv (width, xe->xconfigure.width); 540 setiv (width, xe->xconfigure.width);
521 setiv (height, xe->xconfigure.height); 541 setiv (height, xe->xconfigure.height);
522 setuv (above, xe->xconfigure.above); 542 setuv (above, xe->xconfigure.above);
523 break; 543 break;
524 } 544 }
525 545
526 break; 546 break;
527 547
528 case PropertyNotify: 548 case PropertyNotify:
529 setuv (window, xe->xproperty.window); 549 setuv (window, xe->xproperty.window);
530 setuv (atom, xe->xproperty.atom); 550 setuv (atom, xe->xproperty.atom);
531 setuv (time, xe->xproperty.time); 551 setuv (time, xe->xproperty.time);
532 setiv (state, xe->xproperty.state); 552 setiv (state, xe->xproperty.state);
533 break; 553 break;
534 554
535 case ClientMessage: 555 case ClientMessage:
536 setuv (window, xe->xclient.window); 556 setuv (window, xe->xclient.window);
537 setuv (message_type, xe->xclient.message_type); 557 setuv (message_type, xe->xclient.message_type);
538 setuv (format, xe->xclient.format); 558 setuv (format, xe->xclient.format);
539 setuv (l0, xe->xclient.data.l[0]); 559 setuv (l0, xe->xclient.data.l[0]);
540 setuv (l1, xe->xclient.data.l[1]); 560 setuv (l1, xe->xclient.data.l[1]);
541 setuv (l2, xe->xclient.data.l[2]); 561 setuv (l2, xe->xclient.data.l[2]);
542 setuv (l3, xe->xclient.data.l[3]); 562 setuv (l3, xe->xclient.data.l[3]);
543 setuv (l4, xe->xclient.data.l[4]); 563 setuv (l4, xe->xclient.data.l[4]);
544 break; 564 break;
545 } 565 }
546 566
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 567 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
548 } 568 }
549 break; 569 break;
550 570
551 case DT_END: 571 case DT_END:
552 goto call; 572 goto call;
553 573
554 default: 574 default:
555 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 575 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
556 } 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);
557 } 590 }
558 591
559 call:
560 va_end (ap);
561
562 PUTBACK; 592 PUTBACK;
563 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
564 SPAGAIN;
565
566 if (count)
567 {
568 SV *status = POPs;
569 count = SvTRUE (status);
570 }
571
572 PUTBACK;
573 FREETMPS; 593 FREETMPS;
574 LEAVE; 594 LEAVE;
575 595
576 if (SvTRUE (ERRSV)) 596 if (SvTRUE (ERRSV))
577 { 597 {
578 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));
579 ungrab (term); // better lose the grab than the session 599 ungrab (term); // better lose the grab than the session
580 } 600 }
581 601
582 event_consumed = !!count; 602 event_consumed = !!count;
583 } 603 }
584 catch (...)
585 {
586 swap (perl_environ, environ);
587 throw;
588 }
589 else 604 else
590 event_consumed = false; 605 event_consumed = false;
591 606
592 // post-handling of some events 607 // post-handling of some events
593 if (htype == HOOK_REFRESH_BEGIN) 608 if (htype == HOOK_REFRESH_BEGIN)
… …
604 619
605 // don't allow further calls 620 // don't allow further calls
606 term->perl.self = 0; 621 term->perl.self = 0;
607 } 622 }
608 623
609 swap (perl_environ, environ);
610
611 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;
612} 644}
613 645
614///////////////////////////////////////////////////////////////////////////// 646/////////////////////////////////////////////////////////////////////////////
615 647
616MODULE = urxvt PACKAGE = urxvt 648MODULE = urxvt PACKAGE = urxvt
… …
628# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 660# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
629# include "hookinc.h" 661# include "hookinc.h"
630# undef def 662# undef def
631 663
632 HV *option = get_hv ("urxvt::OPTION", 1); 664 HV *option = get_hv ("urxvt::OPTION", 1);
633# 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);
634# define nodef(name) 666# define nodef(name)
635# include "optinc.h" 667# include "optinc.h"
636# undef nodef 668# undef nodef
637# undef def 669# undef def
638 670
… …
640 static const struct { 672 static const struct {
641 const char *name; 673 const char *name;
642 IV iv; 674 IV iv;
643 } *civ, const_iv[] = { 675 } *civ, const_iv[] = {
644# define const_iv(name) { # name, (IV)name } 676# define const_iv(name) { # name, (IV)name }
677 const_iv (NUM_RESOURCES),
645 const_iv (DEFAULT_RSTYLE), 678 const_iv (DEFAULT_RSTYLE),
646 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),
647 const_iv (RS_Bold), 691 const_iv (RS_Bold),
648 const_iv (RS_Italic), 692 const_iv (RS_Italic),
649 const_iv (RS_Blink), 693 const_iv (RS_Blink),
650 const_iv (RS_RVid), 694 const_iv (RS_RVid),
651 const_iv (RS_Uline), 695 const_iv (RS_Uline),
… …
755 const_iv (XIMDontChange), 799 const_iv (XIMDontChange),
756# endif 800# endif
757# endif 801# endif
758 }; 802 };
759 803
760 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--)
761 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 805 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
762} 806}
763 807
764void 808void
765warn (const char *msg) 809warn (const char *msg)
766 CODE: 810 CODE:
… …
775_exit (int status) 819_exit (int status)
776 820
777NV 821NV
778NOW () 822NOW ()
779 CODE: 823 CODE:
780 RETVAL = NOW; 824 RETVAL = ev::now ();
781 OUTPUT: 825 OUTPUT:
782 RETVAL 826 RETVAL
783 827
784int 828int
785GET_BASEFG (int rend) 829GET_BASEFG (int rend)
… …
838 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++)
839 if ((*t)->perl.self) 883 if ((*t)->perl.self)
840 PUSHs (sv_2mortal (newSVterm (*t))); 884 PUSHs (sv_2mortal (newSVterm (*t)));
841} 885}
842 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
843MODULE = urxvt PACKAGE = urxvt::term 916MODULE = urxvt PACKAGE = urxvt::term
844 917
845SV * 918SV *
846_new (AV *env, AV *arg) 919_new (AV *env, AV *arg)
847 CODE: 920 CODE:
… …
857 for (int i = AvFILL (env) + 1; i--; ) 930 for (int i = AvFILL (env) + 1; i--; )
858 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 931 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
859 932
860 envv->push_back (0); 933 envv->push_back (0);
861 934
862 bool success;
863
864 try 935 try
865 { 936 {
866 success = term->init (argv, envv); 937 term->init (argv, envv);
867 } 938 }
868 catch (const class rxvt_failure_exception &e) 939 catch (const class rxvt_failure_exception &e)
869 {
870 success = false;
871 }
872
873 if (!success)
874 { 940 {
875 term->destroy (); 941 term->destroy ();
876 croak ("error while initializing new terminal instance"); 942 croak ("error while initializing new terminal instance");
877 } 943 }
878 944
… …
912 978
913void 979void
914rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 980rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
915 CODE: 981 CODE:
916 XUngrabKey (THIS->dpy, keycode, modifiers, window); 982 XUngrabKey (THIS->dpy, keycode, modifiers, window);
917
918void
919rxvt_term::XUngrabKeyboard (Time eventtime)
920 CODE:
921 XUngrabKeyboard (THIS->dpy, eventtime);
922 983
923bool 984bool
924rxvt_term::grab (Time eventtime, int sync = 0) 985rxvt_term::grab (Time eventtime, int sync = 0)
925 CODE: 986 CODE:
926{ 987{
… …
1050 OUTPUT: 1111 OUTPUT:
1051 RETVAL 1112 RETVAL
1052 1113
1053#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1114#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1054 1115
1055#define TERM_OFFSET_width TERM_OFFSET(width) 1116#define TERM_OFFSET_width TERM_OFFSET(width)
1056#define TERM_OFFSET_height TERM_OFFSET(height) 1117#define TERM_OFFSET_height TERM_OFFSET(height)
1057#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1118#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1058#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1119#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1059#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1120#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1060#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1121#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1061#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1122#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1062#define TERM_OFFSET_focus TERM_OFFSET(focus) 1123#define TERM_OFFSET_focus TERM_OFFSET(focus)
1063#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1124#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1064#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1125#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1065#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1126#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1066#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1127#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1128#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1067#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1129#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1068#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1130#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1069#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1131#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1070 1132
1071int 1133int
1072rxvt_term::width () 1134rxvt_term::width ()
1073 ALIAS: 1135 ALIAS:
1074 width = TERM_OFFSET_width 1136 width = TERM_OFFSET_width
1075 height = TERM_OFFSET_height 1137 height = TERM_OFFSET_height
1076 fwidth = TERM_OFFSET_fwidth 1138 fwidth = TERM_OFFSET_fwidth
1077 fheight = TERM_OFFSET_fheight 1139 fheight = TERM_OFFSET_fheight
1078 fbase = TERM_OFFSET_fbase 1140 fbase = TERM_OFFSET_fbase
1079 nrow = TERM_OFFSET_nrow 1141 nrow = TERM_OFFSET_nrow
1080 ncol = TERM_OFFSET_ncol 1142 ncol = TERM_OFFSET_ncol
1081 focus = TERM_OFFSET_focus 1143 focus = TERM_OFFSET_focus
1082 mapped = TERM_OFFSET_mapped 1144 mapped = TERM_OFFSET_mapped
1083 int_bwidth = TERM_OFFSET_int_bwidth 1145 int_bwidth = TERM_OFFSET_int_bwidth
1084 ext_bwidth = TERM_OFFSET_ext_bwidth 1146 ext_bwidth = TERM_OFFSET_ext_bwidth
1085 lineSpace = TERM_OFFSET_lineSpace 1147 lineSpace = TERM_OFFSET_lineSpace
1148 letterSpace = TERM_OFFSET_letterSpace
1086 saveLines = TERM_OFFSET_saveLines 1149 saveLines = TERM_OFFSET_saveLines
1087 total_rows = TERM_OFFSET_total_rows 1150 total_rows = TERM_OFFSET_total_rows
1088 top_row = TERM_OFFSET_top_row 1151 top_row = TERM_OFFSET_top_row
1089 CODE: 1152 CODE:
1090 RETVAL = *(int *)((char *)THIS + ix); 1153 RETVAL = *(int *)((char *)THIS + ix);
1091 OUTPUT: 1154 OUTPUT:
1092 RETVAL 1155 RETVAL
1093 1156
… …
1104 { 1167 {
1105 case 0: RETVAL = THIS->ModLevel3Mask; break; 1168 case 0: RETVAL = THIS->ModLevel3Mask; break;
1106 case 1: RETVAL = THIS->ModMetaMask; break; 1169 case 1: RETVAL = THIS->ModMetaMask; break;
1107 case 2: RETVAL = THIS->ModNumLockMask; break; 1170 case 2: RETVAL = THIS->ModNumLockMask; break;
1108 case 3: RETVAL = THIS->current_screen; break; 1171 case 3: RETVAL = THIS->current_screen; break;
1172#ifdef CURSOR_BLINK
1109 case 4: RETVAL = THIS->hidden_cursor; break; 1173 case 4: RETVAL = THIS->hidden_cursor; break;
1174#endif
1110 } 1175 }
1111 OUTPUT: 1176 OUTPUT:
1112 RETVAL 1177 RETVAL
1113 1178
1114char * 1179char *
… …
1139 if (*i) 1204 if (*i)
1140 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1205 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1141} 1206}
1142 1207
1143int 1208int
1144rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1209rxvt_term::pty_ev_events (int events = ev::UNDEF)
1145 CODE: 1210 CODE:
1146 RETVAL = THIS->pty_ev.events; 1211 RETVAL = THIS->pty_ev.events;
1147 if (events != EVENT_UNDEF) 1212 if (events != ev::UNDEF)
1148 THIS->pty_ev.set (events); 1213 THIS->pty_ev.set (events);
1149 OUTPUT: 1214 OUTPUT:
1150 RETVAL 1215 RETVAL
1151 1216
1152int 1217int
… …
1157 RETVAL 1222 RETVAL
1158 1223
1159Window 1224Window
1160rxvt_term::parent () 1225rxvt_term::parent ()
1161 CODE: 1226 CODE:
1162 RETVAL = THIS->parent [0]; 1227 RETVAL = THIS->parent;
1163 OUTPUT: 1228 OUTPUT:
1164 RETVAL 1229 RETVAL
1165 1230
1166Window 1231Window
1167rxvt_term::vt () 1232rxvt_term::vt ()
… …
1194 if (newval <= 0) 1259 if (newval <= 0)
1195 THIS->scr_changeview (max (newval, THIS->top_row)); 1260 THIS->scr_changeview (max (newval, THIS->top_row));
1196} 1261}
1197 OUTPUT: 1262 OUTPUT:
1198 RETVAL 1263 RETVAL
1264
1265void
1266rxvt_term::set_urgency (bool enable)
1199 1267
1200void 1268void
1201rxvt_term::focus_in () 1269rxvt_term::focus_in ()
1202 1270
1203void 1271void
… …
1231 1299
1232void 1300void
1233rxvt_term::want_refresh () 1301rxvt_term::want_refresh ()
1234 CODE: 1302 CODE:
1235 THIS->want_refresh = 1; 1303 THIS->want_refresh = 1;
1304 THIS->refresh_check ();
1236 1305
1237void 1306void
1238rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1307rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1239 PPCODE: 1308 PPCODE:
1240{ 1309{
… …
1435# include "rsinc.h" 1504# include "rsinc.h"
1436# undef def 1505# undef def
1437# undef reserve 1506# undef reserve
1438 }; 1507 };
1439 1508
1440 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1509 rs = rslist + ecb_array_length (rslist);
1441 1510
1511 if (*name)
1442 do { 1512 {
1513 do {
1443 if (rs-- == rslist) 1514 if (rs-- == rslist)
1444 croak ("no such resource '%s', requested", name); 1515 croak ("no such resource '%s', requested", name);
1445 } while (strcmp (name, rs->name)); 1516 } while (strcmp (name, rs->name));
1446 1517
1447 index += rs->value; 1518 index += rs->value;
1519 }
1520 else
1521 {
1522 --rs;
1523 name = "";
1524 }
1448 1525
1449 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1526 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1450 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1527 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1451 1528
1452 if (GIMME_V != G_VOID) 1529 if (GIMME_V != G_VOID)
… …
1476 1553
1477 if (set >= 0) 1554 if (set >= 0)
1478 { 1555 {
1479 THIS->set_option (optval, set); 1556 THIS->set_option (optval, set);
1480 1557
1481 if (THIS->check_ev.is_active ()) // avoid doing this before START 1558 if (THIS->env_colorfgbg [0]) // avoid doing this before START
1482 switch (optval) 1559 switch (optval)
1483 { 1560 {
1484 case Opt_skipBuiltinGlyphs: 1561 case Opt_skipBuiltinGlyphs:
1485 THIS->set_fonts (); 1562 THIS->set_fonts ();
1486 THIS->scr_remap_chars (); 1563 THIS->scr_remap_chars ();
1487 THIS->scr_touch (true); 1564 THIS->scr_touch (true);
1488 THIS->want_refresh = 1; 1565 THIS->want_refresh = 1;
1566 THIS->refresh_check ();
1489 break; 1567 break;
1490 1568
1491 case Opt_cursorUnderline: 1569 case Opt_cursorUnderline:
1492 THIS->want_refresh = 1; 1570 THIS->want_refresh = 1;
1571 THIS->refresh_check ();
1493 break; 1572 break;
1494 1573
1495# case Opt_scrollBar_floating: 1574# case Opt_scrollBar_floating:
1496# case Opt_scrollBar_right: 1575# case Opt_scrollBar_right:
1497# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1576# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1507 CODE: 1586 CODE:
1508 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1587 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1509 THIS->keyboard->register_done (); 1588 THIS->keyboard->register_done ();
1510 OUTPUT: 1589 OUTPUT:
1511 RETVAL 1590 RETVAL
1591
1592void
1593rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1594 CODE:
1595 wchar_t *wstr = sv2wcs (str);
1596 THIS->keyboard->register_user_translation (keysym, state, wstr);
1597 free (wstr);
1512 1598
1513void 1599void
1514rxvt_term::screen_cur (...) 1600rxvt_term::screen_cur (...)
1515 PROTOTYPE: $;$$ 1601 PROTOTYPE: $;$$
1516 ALIAS: 1602 ALIAS:
… …
1530 EXTEND (SP, 2); 1616 EXTEND (SP, 2);
1531 PUSHs (sv_2mortal (newSViv (rc.row))); 1617 PUSHs (sv_2mortal (newSViv (rc.row)));
1532 PUSHs (sv_2mortal (newSViv (rc.col))); 1618 PUSHs (sv_2mortal (newSViv (rc.col)));
1533 } 1619 }
1534 1620
1535 if (items == 3) 1621 if (items >= 3)
1536 { 1622 {
1537 rc.row = SvIV (ST (1)); 1623 rc.row = SvIV (ST (1));
1538 rc.col = SvIV (ST (2)); 1624 rc.col = SvIV (ST (2));
1539 1625
1540 if (ix == 2) 1626 if (ix == 2)
… …
1555 1641
1556 clamp_it (rc.col, 0, THIS->ncol); 1642 clamp_it (rc.col, 0, THIS->ncol);
1557 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1643 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1558 1644
1559 if (ix) 1645 if (ix)
1646 {
1647 THIS->selection.screen = THIS->current_screen;
1648
1560 THIS->want_refresh = 1; 1649 THIS->want_refresh = 1;
1650 THIS->refresh_check ();
1561 } 1651 }
1652 }
1562} 1653}
1563 1654
1564char 1655int
1565rxvt_term::cur_charset () 1656rxvt_term::selection_screen (int screen = -1)
1566 CODE: 1657 CODE:
1567 RETVAL = THIS->charsets [THIS->screen.charset]; 1658 RETVAL = THIS->selection.screen;
1568 OUTPUT: 1659 if (screen >= 0)
1660 THIS->selection.screen = screen;
1661 OUTPUT:
1569 RETVAL 1662 RETVAL
1570 1663
1571void 1664void
1572rxvt_term::selection_clear () 1665rxvt_term::selection_clear (bool clipboard = false)
1573 1666
1574void 1667void
1575rxvt_term::selection_make (Time eventtime, bool rect = false) 1668rxvt_term::selection_make (Time eventtime, bool rect = false)
1576 CODE: 1669 CODE:
1577 THIS->selection.op = SELECTION_CONT; 1670 THIS->selection.op = SELECTION_CONT;
1578 THIS->selection.rect = rect; 1671 THIS->selection.rect = rect;
1579 THIS->selection_make (eventtime); 1672 THIS->selection_make (eventtime);
1580 1673
1581int 1674int
1582rxvt_term::selection_grab (Time eventtime) 1675rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1583 1676
1584void 1677void
1585rxvt_term::selection (SV *newtext = 0) 1678rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1586 PPCODE: 1679 PPCODE:
1587{ 1680{
1681 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1682 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1683
1588 if (GIMME_V != G_VOID) 1684 if (GIMME_V != G_VOID)
1589 XPUSHs (THIS->selection.text 1685 XPUSHs (text
1590 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1686 ? sv_2mortal (wcs2sv (text, len))
1591 : &PL_sv_undef); 1687 : &PL_sv_undef);
1592 1688
1593 if (newtext) 1689 if (newtext)
1594 { 1690 {
1595 free (THIS->selection.text); 1691 free (text);
1596 1692
1597 THIS->selection.text = sv2wcs (newtext); 1693 text = sv2wcs (newtext);
1598 THIS->selection.len = wcslen (THIS->selection.text); 1694 len = wcslen (text);
1599 } 1695 }
1600} 1696}
1697
1698char
1699rxvt_term::cur_charset ()
1700 CODE:
1701 RETVAL = THIS->charsets [THIS->screen.charset];
1702 OUTPUT:
1703 RETVAL
1601 1704
1602void 1705void
1603rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1706rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1604 1707
1605void 1708void
… …
1627 char *str = SvPVbyte (octets, len); 1730 char *str = SvPVbyte (octets, len);
1628 C_ARGS: 1731 C_ARGS:
1629 str, len 1732 str, len
1630 1733
1631void 1734void
1735rxvt_term::tt_paste (SV *octets)
1736 INIT:
1737 STRLEN len;
1738 char *str = SvPVbyte (octets, len);
1739 C_ARGS:
1740 str, len
1741
1742void
1632rxvt_term::cmd_parse (SV *octets) 1743rxvt_term::cmd_parse (SV *octets)
1633 CODE: 1744 CODE:
1634{ 1745{
1635 STRLEN len; 1746 STRLEN len;
1636 char *str = SvPVbyte (octets, len); 1747 char *str = SvPVbyte (octets, len);
… …
1705 XFree (prop); 1816 XFree (prop);
1706 } 1817 }
1707} 1818}
1708 1819
1709void 1820void
1710rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1821rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1711 CODE: 1822 CODE:
1712{ 1823{
1713 STRLEN len; 1824 STRLEN len;
1714 char *data_ = SvPVbyte (data, len); 1825 char *data_ = SvPVbyte (data, len);
1715 1826

Diff Legend

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