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

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.109 by root, Thu Dec 14 15:19:31 2006 UTC vs.
Revision 1.158 by root, Sun Jun 3 18:04:44 2012 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
23#define line_t perl_line_t 23#define line_t perl_line_t
24#include <EXTERN.h> 24#include <EXTERN.h>
25#include <perl.h> 25#include <perl.h>
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28#undef bool // perl defines it's own bool type, except with g++... what a trap
28 29
29#include "../config.h" 30#include "../config.h"
30 31
31#include <cstddef> 32#include <stddef.h>
32#include <cstdarg> 33#include <stdarg.h>
33 34
34#include "unistd.h" 35#include "unistd.h"
35 36
36#include "iom.h" 37#include "ev_cpp.h"
37#include "rxvt.h" 38#include "rxvt.h"
38#include "keyboard.h" 39#include "keyboard.h"
39#include "rxvtutil.h" 40#include "rxvtutil.h"
40#include "rxvtperl.h" 41#include "rxvtperl.h"
41 42
42#include "perlxsi.c" 43#include "perlxsi.c"
43 44
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 46
50#undef LINENO 47#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 49#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
54 51
55typedef int CHAINED UNUSED; 52/////////////////////////////////////////////////////////////////////////////
53
54typedef char * octet_string;
55typedef char * utf8_string;
56
57typedef GdkPixbuf * urxvt__pixbuf;
58typedef rxvt_img * urxvt__img;
59
60/////////////////////////////////////////////////////////////////////////////
61
62static void
63parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
64{
65 //TODO: support component stuff
66 c.set (s, SvPVbyte_nolen (sv));
67}
56 68
57///////////////////////////////////////////////////////////////////////////// 69/////////////////////////////////////////////////////////////////////////////
58 70
59static wchar_t * 71static wchar_t *
60sv2wcs (SV *sv) 72sv2wcs (SV *sv)
… …
75 87
76 return sv; 88 return sv;
77} 89}
78 90
79static SV * 91static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85static SV *
86newSVptr (void *ptr, const char *klass) 92newSVptr (void *ptr, const char *klass)
87{ 93{
88 HV *hv = newHV (); 94 HV *hv = newHV ();
89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 95 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
90 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 96 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
119 125
120///////////////////////////////////////////////////////////////////////////// 126/////////////////////////////////////////////////////////////////////////////
121 127
122#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 128#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
123 129
124class overlay { 130class overlay : overlay_base
131{
125 rxvt_term *THIS; 132 rxvt_term *THIS;
126 AV *overlay_av; 133 AV *overlay_av;
127 int x, y, w, h;
128 int border; 134 int border;
129 text_t **text;
130 rend_t **rend;
131 135
132public: 136public:
133 HV *self; 137 HV *self;
134 138
135 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 139 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
142 146
143 void set (int x, int y, SV *str, SV *rend); 147 void set (int x, int y, SV *str, SV *rend);
144}; 148};
145 149
146overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 150overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
147: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 151: THIS(THIS), border(border == 2), overlay_av (0)
148{ 152{
153 x = x_;
154 y = y_;
155 w = w_;
156 h = h_;
157
149 if (w < 0) w = 0; 158 if (w < 0) w = 0;
150 if (h < 0) h = 0; 159 if (h < 0) h = 0;
151 160
152 if (border == 2) 161 if (border == 2)
153 { 162 {
… …
222 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 231 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
223 )); 232 ));
224 av_push (overlay_av, newSViv ((long)this)); 233 av_push (overlay_av, newSViv ((long)this));
225 234
226 THIS->want_refresh = 1; 235 THIS->want_refresh = 1;
236 THIS->refresh_check ();
227} 237}
228 238
229void 239void
230overlay::hide () 240overlay::hide ()
231{ 241{
… …
245 255
246 SvREFCNT_dec (overlay_av); 256 SvREFCNT_dec (overlay_av);
247 overlay_av = 0; 257 overlay_av = 0;
248 258
249 THIS->want_refresh = 1; 259 THIS->want_refresh = 1;
260 THIS->refresh_check ();
250} 261}
251 262
252void overlay::swap () 263void overlay::swap ()
253{ 264{
254 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 265 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
255 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 266 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
256 267
257 int ov_w = min (w, THIS->ncol - ov_x); 268 int ov_w = min (w, THIS->ncol - ov_x);
258 int ov_h = min (h, THIS->nrow - ov_y); 269 int ov_h = min (h, THIS->nrow - ov_y);
270
271 // hide cursor if it is within the overlay area
272 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
273 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
274 THIS->screen.flags &= ~Screen_VisibleCursor;
259 275
260 for (int y = ov_h; y--; ) 276 for (int y = ov_h; y--; )
261 { 277 {
262 text_t *t1 = text [y]; 278 text_t *t1 = text [y];
263 rend_t *r1 = rend [y]; 279 rend_t *r1 = rend [y];
… …
299 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 315 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
300 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 316 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
301 } 317 }
302 318
303 THIS->want_refresh = 1; 319 THIS->want_refresh = 1;
320 THIS->refresh_check ();
304} 321}
305 322
306///////////////////////////////////////////////////////////////////////////// 323/////////////////////////////////////////////////////////////////////////////
307 324
308#define IOM_CLASS "urxvt"
309#include <iom_perl.h> 325#include "iom_perl.h"
310 326
311///////////////////////////////////////////////////////////////////////////// 327/////////////////////////////////////////////////////////////////////////////
312 328
313struct rxvt_perl_interp rxvt_perl; 329struct rxvt_perl_interp rxvt_perl;
314 330
… …
318{ 334{
319 if (perl) 335 if (perl)
320 { 336 {
321 perl_destruct (perl); 337 perl_destruct (perl);
322 perl_free (perl); 338 perl_free (perl);
339 PERL_SYS_TERM ();
323 } 340 }
324} 341}
325 342
326void 343void
327rxvt_perl_interp::init (rxvt_term *term) 344rxvt_perl_interp::init (rxvt_term *term)
328{ 345{
329 if (!perl) 346 if (!perl)
330 { 347 {
331 rxvt_push_locale (""); // perl init destroys current locale 348 rxvt_push_locale (""); // perl init destroys current locale
332 349
350 {
333 perl_environ = rxvt_environ; 351 perl_environ = rxvt_environ;
334 swap (perl_environ, environ); 352 localise_env set_environ (perl_environ);
335 353
336 char *argv[] = { 354 char *args[] = {
337 "", 355 "",
338 "-e" 356 "-e"
339 "BEGIN {" 357 "BEGIN {"
340 " urxvt->bootstrap;" 358 " urxvt->bootstrap;"
341 " unshift @INC, '" LIBDIR "';" 359 " unshift @INC, '" LIBDIR "';"
342 "}" 360 "}"
343 "" 361 ""
344 "use urxvt;" 362 "use urxvt;"
345 }; 363 };
364 int argc = ecb_array_length (args);
365 char **argv = args;
346 366
367 PERL_SYS_INIT3 (&argc, &argv, &environ);
347 perl = perl_alloc (); 368 perl = perl_alloc ();
348 perl_construct (perl); 369 perl_construct (perl);
349 370
350 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 371 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
351 || perl_run (perl)) 372 || perl_run (perl))
352 { 373 {
353 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 374 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
354 375
355 perl_destruct (perl); 376 perl_destruct (perl);
356 perl_free (perl); 377 perl_free (perl);
357 perl = 0; 378 perl = 0;
358 } 379 }
359 380 }
360 swap (perl_environ, environ);
361 381
362 rxvt_pop_locale (); 382 rxvt_pop_locale ();
363 } 383 }
364 384
365 if (perl) 385 if (perl)
366 { 386 {
367 // runs outside of perls ENV 387 // runs outside of perls ENV
368 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 388 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
369 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 389 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
390 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
370 } 391 }
371} 392}
372 393
373static void 394static void
374ungrab (rxvt_term *THIS) 395ungrab (rxvt_term *THIS)
… …
385rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 406rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
386{ 407{
387 if (!perl || !term->perl.self) 408 if (!perl || !term->perl.self)
388 return false; 409 return false;
389 410
411 localise_env set_environ (perl_environ);
412
390 // pre-handling of some events 413 // pre-handling of some events
391 if (htype == HOOK_REFRESH_END) 414 if (htype == HOOK_REFRESH_END)
392 { 415 {
393 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 416 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
394 417
395 for (int i = 0; i <= AvFILL (av); i++) 418 for (int i = 0; i <= AvFILL (av); i++)
396 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 419 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
397 } 420 }
421 else if (htype == HOOK_DESTROY)
422 {
423 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
398 424
399 swap (perl_environ, environ); 425 for (int i = AvFILL (av); i >= 0; i--)
426 {
427 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
428 delete req;
429 }
430 }
400 431
401 bool event_consumed; 432 bool event_consumed;
402 433
403 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 434 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
404 || term->perl.should_invoke [htype]) 435 || term->perl.should_invoke [htype])
405 try
406 { 436 {
407 dSP; 437 dSP;
408 va_list ap; 438 va_list ap;
409 439
410 va_start (ap, htype); 440 va_start (ap, htype);
411 441
412 ENTER; 442 ENTER;
413 SAVETMPS; 443 SAVETMPS;
414 444
415 PUSHMARK (SP); 445 PUSHMARK (SP);
416 446
447 EXTEND (SP, 2);
417 XPUSHs (sv_2mortal (newSVterm (term))); 448 PUSHs (sv_2mortal (newSVterm (term)));
418 XPUSHs (sv_2mortal (newSViv (htype))); 449 PUSHs (sv_2mortal (newSViv (htype)));
419 450
420 for (;;) { 451 for (;;) {
421 data_type dt = (data_type)va_arg (ap, int); 452 data_type dt = (data_type)va_arg (ap, int);
422 453
423 switch (dt) 454 switch (dt)
424 { 455 {
425 case DT_INT: 456 case DT_INT:
426 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 457 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
427 break; 458 break;
428 459
429 case DT_LONG: 460 case DT_LONG:
430 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 461 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
431 break; 462 break;
432 463
433 case DT_STR: 464 case DT_STR:
434 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 465 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
435 break; 466 break;
436 467
437 case DT_STR_LEN: 468 case DT_STR_LEN:
438 { 469 {
439 char *str = va_arg (ap, char *); 470 char *str = va_arg (ap, char *);
440 int len = va_arg (ap, int); 471 int len = va_arg (ap, int);
441 472
442 XPUSHs (sv_2mortal (newSVpvn (str, len))); 473 XPUSHs (sv_2mortal (newSVpvn (str, len)));
443 } 474 }
444 break; 475 break;
445 476
446 case DT_WCS_LEN: 477 case DT_WCS_LEN:
447 { 478 {
448 wchar_t *wstr = va_arg (ap, wchar_t *); 479 wchar_t *wstr = va_arg (ap, wchar_t *);
449 int wlen = va_arg (ap, int); 480 int wlen = va_arg (ap, int);
450 481
451 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 482 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
452 } 483 }
453 break; 484 break;
454 485
455 case DT_LCS_LEN: 486 case DT_LCS_LEN:
456 { 487 {
457 long *lstr = va_arg (ap, long *); 488 long *lstr = va_arg (ap, long *);
458 int llen = va_arg (ap, int); 489 int llen = va_arg (ap, int);
459 490
460 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 491 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
461 } 492 }
462 break; 493 break;
463 494
464 case DT_XEVENT: 495 case DT_XEVENT:
465 { 496 {
466 XEvent *xe = va_arg (ap, XEvent *); 497 XEvent *xe = va_arg (ap, XEvent *);
467 HV *hv = newHV (); 498 HV *hv = newHV ();
468 499
469# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 500# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
470# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 501# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
471# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 502# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
472# undef set 503# undef set
473 504
474 setiv (type, xe->type); 505 setiv (type, xe->type);
475 setiv (send_event, xe->xany.send_event); 506 setiv (send_event, xe->xany.send_event);
476 setiv (serial, xe->xany.serial); 507 setiv (serial, xe->xany.serial);
477 508
478 switch (xe->type) 509 switch (xe->type)
479 { 510 {
480 case KeyPress: 511 case KeyPress:
481 case KeyRelease: 512 case KeyRelease:
482 case ButtonPress: 513 case ButtonPress:
483 case ButtonRelease: 514 case ButtonRelease:
484 case MotionNotify: 515 case MotionNotify:
485 setuv (window, xe->xmotion.window); 516 setuv (window, xe->xmotion.window);
486 setuv (root, xe->xmotion.root); 517 setuv (root, xe->xmotion.root);
487 setuv (subwindow, xe->xmotion.subwindow); 518 setuv (subwindow, xe->xmotion.subwindow);
488 setuv (time, xe->xmotion.time); 519 setuv (time, xe->xmotion.time);
489 setiv (x, xe->xmotion.x); 520 setiv (x, xe->xmotion.x);
490 setiv (y, xe->xmotion.y); 521 setiv (y, xe->xmotion.y);
491 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 522 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
492 setiv (col, xe->xmotion.x / term->fwidth); 523 setiv (col, xe->xmotion.x / term->fwidth);
493 setiv (x_root, xe->xmotion.x_root); 524 setiv (x_root, xe->xmotion.x_root);
494 setiv (y_root, xe->xmotion.y_root); 525 setiv (y_root, xe->xmotion.y_root);
495 setuv (state, xe->xmotion.state); 526 setuv (state, xe->xmotion.state);
496 527
497 switch (xe->type) 528 switch (xe->type)
498 { 529 {
499 case KeyPress: 530 case KeyPress:
500 case KeyRelease: 531 case KeyRelease:
501 setuv (keycode, xe->xkey.keycode); 532 setuv (keycode, xe->xkey.keycode);
502 break; 533 break;
503 534
504 case ButtonPress: 535 case ButtonPress:
505 case ButtonRelease: 536 case ButtonRelease:
506 setuv (button, xe->xbutton.button); 537 setuv (button, xe->xbutton.button);
507 break; 538 break;
508 539
509 case MotionNotify: 540 case MotionNotify:
510 setiv (is_hint, xe->xmotion.is_hint); 541 setiv (is_hint, xe->xmotion.is_hint);
511 break; 542 break;
512 } 543 }
513 544
514 break; 545 break;
515 546
516 case MapNotify: 547 case MapNotify:
517 case UnmapNotify: 548 case UnmapNotify:
518 case ConfigureNotify: 549 case ConfigureNotify:
519 setuv (event, xe->xconfigure.event); 550 setuv (event, xe->xconfigure.event);
520 setuv (window, xe->xconfigure.window); 551 setuv (window, xe->xconfigure.window);
521 552
522 switch (xe->type) 553 switch (xe->type)
523 { 554 {
524 case ConfigureNotify: 555 case ConfigureNotify:
525 setiv (x, xe->xconfigure.x); 556 setiv (x, xe->xconfigure.x);
526 setiv (y, xe->xconfigure.y); 557 setiv (y, xe->xconfigure.y);
527 setiv (width, xe->xconfigure.width); 558 setiv (width, xe->xconfigure.width);
528 setiv (height, xe->xconfigure.height); 559 setiv (height, xe->xconfigure.height);
529 setuv (above, xe->xconfigure.above); 560 setuv (above, xe->xconfigure.above);
530 break; 561 break;
531 } 562 }
532 563
533 break; 564 break;
534 565
535 case PropertyNotify: 566 case PropertyNotify:
536 setuv (window, xe->xproperty.window); 567 setuv (window, xe->xproperty.window);
537 setuv (atom, xe->xproperty.atom); 568 setuv (atom, xe->xproperty.atom);
538 setuv (time, xe->xproperty.time); 569 setuv (time, xe->xproperty.time);
539 setiv (state, xe->xproperty.state); 570 setiv (state, xe->xproperty.state);
540 break; 571 break;
541 572
542 case ClientMessage: 573 case ClientMessage:
543 setuv (window, xe->xclient.window); 574 setuv (window, xe->xclient.window);
544 setuv (message_type, xe->xclient.message_type); 575 setuv (message_type, xe->xclient.message_type);
545 setuv (format, xe->xclient.format); 576 setuv (format, xe->xclient.format);
546 setuv (l0, xe->xclient.data.l[0]); 577 setuv (l0, xe->xclient.data.l[0]);
547 setuv (l1, xe->xclient.data.l[1]); 578 setuv (l1, xe->xclient.data.l[1]);
548 setuv (l2, xe->xclient.data.l[2]); 579 setuv (l2, xe->xclient.data.l[2]);
549 setuv (l3, xe->xclient.data.l[3]); 580 setuv (l3, xe->xclient.data.l[3]);
550 setuv (l4, xe->xclient.data.l[4]); 581 setuv (l4, xe->xclient.data.l[4]);
551 break; 582 break;
552 } 583 }
553 584
554 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 585 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
555 } 586 }
556 break; 587 break;
557 588
558 case DT_END: 589 case DT_END:
559 goto call; 590 goto call;
560 591
561 default: 592 default:
562 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 593 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
563 } 594 }
595 }
596
597 call:
598 va_end (ap);
599
600 PUTBACK;
601 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
602 SPAGAIN;
603
604 if (count)
605 {
606 SV *status = POPs;
607 count = SvTRUE (status);
564 } 608 }
565 609
566 call:
567 va_end (ap);
568
569 PUTBACK; 610 PUTBACK;
570 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
571 SPAGAIN;
572
573 if (count)
574 {
575 SV *status = POPs;
576 count = SvTRUE (status);
577 }
578
579 PUTBACK;
580 FREETMPS; 611 FREETMPS;
581 LEAVE; 612 LEAVE;
582 613
583 if (SvTRUE (ERRSV)) 614 if (SvTRUE (ERRSV))
584 { 615 {
585 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 616 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
586 ungrab (term); // better lose the grab than the session 617 ungrab (term); // better lose the grab than the session
587 } 618 }
588 619
589 event_consumed = !!count; 620 event_consumed = !!count;
590 } 621 }
591 catch (...)
592 {
593 swap (perl_environ, environ);
594 throw;
595 }
596 else 622 else
597 event_consumed = false; 623 event_consumed = false;
598 624
599 // post-handling of some events 625 // post-handling of some events
600 if (htype == HOOK_REFRESH_BEGIN) 626 if (htype == HOOK_REFRESH_BEGIN)
601 { 627 {
602 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 628 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
603 629
604 for (int i = AvFILL (av); i >= 0; i--) 630 for (int i = AvFILL (av); i >= 0; i--)
605 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 631 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
606 } 632 }
607 else if (htype == HOOK_DESTROY) 633 else if (htype == HOOK_DESTROY)
608 { 634 {
609 clearSVptr ((SV *)term->perl.self); 635 clearSVptr ((SV *)term->perl.self);
610 SvREFCNT_dec ((SV *)term->perl.self); 636 SvREFCNT_dec ((SV *)term->perl.self);
611 637
612 // don't allow further calls 638 // don't allow further calls
613 term->perl.self = 0; 639 term->perl.self = 0;
614 } 640 }
615 641
616 swap (perl_environ, environ);
617
618 return event_consumed; 642 return event_consumed;
643}
644
645void
646rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
647{
648 localise_env set_environ (perl_environ);
649
650 ENTER;
651 SAVETMPS;
652
653 dSP;
654 XPUSHs (sv_2mortal (newSVpvn (data, len)));
655 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
656
657 if (SvTRUE (ERRSV))
658 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
659
660 FREETMPS;
661 LEAVE;
619} 662}
620 663
621///////////////////////////////////////////////////////////////////////////// 664/////////////////////////////////////////////////////////////////////////////
622 665
623MODULE = urxvt PACKAGE = urxvt 666MODULE = urxvt PACKAGE = urxvt
… …
635# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 678# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
636# include "hookinc.h" 679# include "hookinc.h"
637# undef def 680# undef def
638 681
639 HV *option = get_hv ("urxvt::OPTION", 1); 682 HV *option = get_hv ("urxvt::OPTION", 1);
640# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 683# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
641# define nodef(name) 684# define nodef(name)
642# include "optinc.h" 685# include "optinc.h"
643# undef nodef 686# undef nodef
644# undef def 687# undef def
645 688
… …
647 static const struct { 690 static const struct {
648 const char *name; 691 const char *name;
649 IV iv; 692 IV iv;
650 } *civ, const_iv[] = { 693 } *civ, const_iv[] = {
651# define const_iv(name) { # name, (IV)name } 694# define const_iv(name) { # name, (IV)name }
695 const_iv (NUM_RESOURCES),
652 const_iv (DEFAULT_RSTYLE), 696 const_iv (DEFAULT_RSTYLE),
653 const_iv (OVERLAY_RSTYLE), 697 const_iv (OVERLAY_RSTYLE),
698 const_iv (Color_Bits),
699 const_iv (RS_bgShift), const_iv (RS_bgMask),
700 const_iv (RS_fgShift), const_iv (RS_fgMask),
701 const_iv (RS_Careful),
702 const_iv (RS_fontCount),
703 const_iv (RS_fontShift),
704 const_iv (RS_fontMask),
705 const_iv (RS_baseattrMask),
706 const_iv (RS_attrMask),
707 const_iv (RS_redraw),
708 const_iv (RS_Sel),
654 const_iv (RS_Bold), 709 const_iv (RS_Bold),
655 const_iv (RS_Italic), 710 const_iv (RS_Italic),
656 const_iv (RS_Blink), 711 const_iv (RS_Blink),
657 const_iv (RS_RVid), 712 const_iv (RS_RVid),
658 const_iv (RS_Uline), 713 const_iv (RS_Uline),
… …
674 const_iv (AnyModifier), 729 const_iv (AnyModifier),
675 730
676 const_iv (NoSymbol), 731 const_iv (NoSymbol),
677 const_iv (GrabModeSync), 732 const_iv (GrabModeSync),
678 const_iv (GrabModeAsync), 733 const_iv (GrabModeAsync),
679
680 const_iv (EVENT_NONE),
681 const_iv (EVENT_READ),
682 const_iv (EVENT_WRITE),
683 734
684 const_iv (NoEventMask), 735 const_iv (NoEventMask),
685 const_iv (KeyPressMask), 736 const_iv (KeyPressMask),
686 const_iv (KeyReleaseMask), 737 const_iv (KeyReleaseMask),
687 const_iv (ButtonPressMask), 738 const_iv (ButtonPressMask),
… …
749 const_iv (XIMSecondary), 800 const_iv (XIMSecondary),
750 const_iv (XIMTertiary), 801 const_iv (XIMTertiary),
751 const_iv (XIMVisibleToForward), 802 const_iv (XIMVisibleToForward),
752 const_iv (XIMVisibleToBackword), 803 const_iv (XIMVisibleToBackword),
753 const_iv (XIMVisibleToCenter), 804 const_iv (XIMVisibleToCenter),
805#if HAVE_XRENDER
806 const_iv (PictStandardARGB32),
807 const_iv (PictStandardRGB24),
808 const_iv (PictStandardA8),
809 const_iv (PictStandardA4),
810 const_iv (PictStandardA1),
811#endif
754# if 0 812# if 0
755 const_iv (XIMForwardChar), 813 const_iv (XIMForwardChar),
756 const_iv (XIMBackwardChar), 814 const_iv (XIMBackwardChar),
757 const_iv (XIMForwardWord), 815 const_iv (XIMForwardWord),
758 const_iv (XIMBackwardWord), 816 const_iv (XIMBackwardWord),
… …
766 const_iv (XIMDontChange), 824 const_iv (XIMDontChange),
767# endif 825# endif
768# endif 826# endif
769 }; 827 };
770 828
771 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 829 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
772 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 830 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
773} 831}
774 832
775void 833void
776warn (const char *msg) 834warn (const char *msg)
777 CODE: 835 CODE:
… …
786_exit (int status) 844_exit (int status)
787 845
788NV 846NV
789NOW () 847NOW ()
790 CODE: 848 CODE:
791 RETVAL = NOW; 849 RETVAL = ev::now ();
792 OUTPUT: 850 OUTPUT:
793 RETVAL 851 RETVAL
794 852
795int 853int
796GET_BASEFG (int rend) 854GET_BASEFG (int rend)
… …
849 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 907 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
850 if ((*t)->perl.self) 908 if ((*t)->perl.self)
851 PUSHs (sv_2mortal (newSVterm (*t))); 909 PUSHs (sv_2mortal (newSVterm (*t)));
852} 910}
853 911
912IV
913_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
914 CODE:
915 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
916 req->cb_sv = newSVsv (cb);
917 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
918 av_push (av, newSViv ((IV)req));
919 RETVAL = (IV)req;
920 OUTPUT:
921 RETVAL
922
923void
924_delete_selection_request (IV req_)
925 CODE:
926 rxvt_selection *req = (rxvt_selection *)req_;
927 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
928 int i;
929
930 for (i = AvFILL (av); i >= 0; i--)
931 if (SvIV (*av_fetch (av, i, 1)) == req_)
932 break;
933
934 for (; i < AvFILL (av); i++)
935 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
936
937 av_pop (av);
938
939 delete req;
940
854MODULE = urxvt PACKAGE = urxvt::term 941MODULE = urxvt PACKAGE = urxvt::term
855 942
856SV * 943SV *
857_new (AV *env, AV *arg) 944_new (AV *env, AV *arg)
858 CODE: 945 CODE:
859{ 946{
860 rxvt_term *term = new rxvt_term; 947 rxvt_term *term = new rxvt_term;
861 948
862 stringvec *argv = new stringvec; 949 stringvec *argv = new stringvec;
863 stringvec *envv = new stringvec;
864
865 for (int i = 0; i <= AvFILL (arg); i++) 950 for (int i = 0; i <= AvFILL (arg); i++)
866 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 951 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
867 952
953 stringvec *envv = new stringvec;
868 for (int i = AvFILL (env) + 1; i--; ) 954 for (int i = AvFILL (env) + 1; i--; )
869 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 955 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
870 956
871 envv->push_back (0);
872
873 bool success;
874
875 try 957 try
876 { 958 {
877 success = term->init (argv, envv); 959 term->init (argv, envv);
878 } 960 }
879 catch (const class rxvt_failure_exception &e) 961 catch (const class rxvt_failure_exception &e)
880 {
881 success = false;
882 }
883
884 if (!success)
885 { 962 {
886 term->destroy (); 963 term->destroy ();
887 croak ("error while initializing new terminal instance"); 964 croak ("error while initializing new terminal instance");
888 } 965 }
889 966
… …
923 1000
924void 1001void
925rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 1002rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
926 CODE: 1003 CODE:
927 XUngrabKey (THIS->dpy, keycode, modifiers, window); 1004 XUngrabKey (THIS->dpy, keycode, modifiers, window);
928
929void
930rxvt_term::XUngrabKeyboard (Time eventtime)
931 CODE:
932 XUngrabKeyboard (THIS->dpy, eventtime);
933 1005
934bool 1006bool
935rxvt_term::grab (Time eventtime, int sync = 0) 1007rxvt_term::grab (Time eventtime, int sync = 0)
936 CODE: 1008 CODE:
937{ 1009{
… …
1052 free (wstr); 1124 free (wstr);
1053} 1125}
1054 OUTPUT: 1126 OUTPUT:
1055 RETVAL 1127 RETVAL
1056 1128
1057char *
1058rxvt_term::locale ()
1059 CODE:
1060 RETVAL = THIS->locale;
1061 OUTPUT:
1062 RETVAL
1063
1064#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1129#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1065 1130
1066#define TERM_OFFSET_width TERM_OFFSET(width) 1131#define TERM_OFFSET_width TERM_OFFSET(width)
1067#define TERM_OFFSET_height TERM_OFFSET(height) 1132#define TERM_OFFSET_height TERM_OFFSET(height)
1068#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1133#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1069#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1134#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1070#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1135#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1071#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1136#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1072#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1137#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1073#define TERM_OFFSET_focus TERM_OFFSET(focus) 1138#define TERM_OFFSET_focus TERM_OFFSET(focus)
1074#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1139#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1075#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1140#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1076#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1141#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1077#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1142#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1143#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1078#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1144#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1079#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1145#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1080#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1146#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1081 1147
1082int 1148int
1083rxvt_term::width () 1149rxvt_term::width ()
1084 ALIAS: 1150 ALIAS:
1085 width = TERM_OFFSET_width 1151 width = TERM_OFFSET_width
1086 height = TERM_OFFSET_height 1152 height = TERM_OFFSET_height
1087 fwidth = TERM_OFFSET_fwidth 1153 fwidth = TERM_OFFSET_fwidth
1088 fheight = TERM_OFFSET_fheight 1154 fheight = TERM_OFFSET_fheight
1089 fbase = TERM_OFFSET_fbase 1155 fbase = TERM_OFFSET_fbase
1090 nrow = TERM_OFFSET_nrow 1156 nrow = TERM_OFFSET_nrow
1091 ncol = TERM_OFFSET_ncol 1157 ncol = TERM_OFFSET_ncol
1092 focus = TERM_OFFSET_focus 1158 focus = TERM_OFFSET_focus
1093 mapped = TERM_OFFSET_mapped 1159 mapped = TERM_OFFSET_mapped
1094 int_bwidth = TERM_OFFSET_int_bwidth 1160 int_bwidth = TERM_OFFSET_int_bwidth
1095 ext_bwidth = TERM_OFFSET_ext_bwidth 1161 ext_bwidth = TERM_OFFSET_ext_bwidth
1096 lineSpace = TERM_OFFSET_lineSpace 1162 lineSpace = TERM_OFFSET_lineSpace
1163 letterSpace = TERM_OFFSET_letterSpace
1097 saveLines = TERM_OFFSET_saveLines 1164 saveLines = TERM_OFFSET_saveLines
1098 total_rows = TERM_OFFSET_total_rows 1165 total_rows = TERM_OFFSET_total_rows
1099 top_row = TERM_OFFSET_top_row 1166 top_row = TERM_OFFSET_top_row
1100 CODE: 1167 CODE:
1101 RETVAL = *(int *)((char *)THIS + ix); 1168 RETVAL = *(int *)((char *)THIS + ix);
1102 OUTPUT: 1169 OUTPUT:
1103 RETVAL 1170 RETVAL
1104 1171
… …
1115 { 1182 {
1116 case 0: RETVAL = THIS->ModLevel3Mask; break; 1183 case 0: RETVAL = THIS->ModLevel3Mask; break;
1117 case 1: RETVAL = THIS->ModMetaMask; break; 1184 case 1: RETVAL = THIS->ModMetaMask; break;
1118 case 2: RETVAL = THIS->ModNumLockMask; break; 1185 case 2: RETVAL = THIS->ModNumLockMask; break;
1119 case 3: RETVAL = THIS->current_screen; break; 1186 case 3: RETVAL = THIS->current_screen; break;
1187#ifdef CURSOR_BLINK
1120 case 4: RETVAL = THIS->hidden_cursor; break; 1188 case 4: RETVAL = THIS->hidden_cursor; break;
1189#endif
1121 } 1190 }
1122 OUTPUT: 1191 OUTPUT:
1123 RETVAL 1192 RETVAL
1124 1193
1125char * 1194char *
… …
1150 if (*i) 1219 if (*i)
1151 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1220 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1152} 1221}
1153 1222
1154int 1223int
1155rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1224rxvt_term::pty_ev_events (int events = ev::UNDEF)
1156 CODE: 1225 CODE:
1157 RETVAL = THIS->pty_ev.events; 1226 RETVAL = THIS->pty_ev.events;
1158 if (events != EVENT_UNDEF) 1227 if (events != ev::UNDEF)
1159 THIS->pty_ev.set (events); 1228 THIS->pty_ev.set (events);
1160 OUTPUT: 1229 OUTPUT:
1161 RETVAL 1230 RETVAL
1162 1231
1163int 1232int
… …
1168 RETVAL 1237 RETVAL
1169 1238
1170Window 1239Window
1171rxvt_term::parent () 1240rxvt_term::parent ()
1172 CODE: 1241 CODE:
1173 RETVAL = THIS->parent [0]; 1242 RETVAL = THIS->parent;
1174 OUTPUT: 1243 OUTPUT:
1175 RETVAL 1244 RETVAL
1176 1245
1177Window 1246Window
1178rxvt_term::vt () 1247rxvt_term::vt ()
… …
1205 if (newval <= 0) 1274 if (newval <= 0)
1206 THIS->scr_changeview (max (newval, THIS->top_row)); 1275 THIS->scr_changeview (max (newval, THIS->top_row));
1207} 1276}
1208 OUTPUT: 1277 OUTPUT:
1209 RETVAL 1278 RETVAL
1279
1280void
1281rxvt_term::set_urgency (bool enable)
1210 1282
1211void 1283void
1212rxvt_term::focus_in () 1284rxvt_term::focus_in ()
1213 1285
1214void 1286void
… …
1242 1314
1243void 1315void
1244rxvt_term::want_refresh () 1316rxvt_term::want_refresh ()
1245 CODE: 1317 CODE:
1246 THIS->want_refresh = 1; 1318 THIS->want_refresh = 1;
1319 THIS->refresh_check ();
1247 1320
1248void 1321void
1249rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1322rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1250 PPCODE: 1323 PPCODE:
1251{ 1324{
… …
1406SV * 1479SV *
1407rxvt_term::special_decode (SV *text) 1480rxvt_term::special_decode (SV *text)
1408 CODE: 1481 CODE:
1409{ 1482{
1410 wchar_t *wstr = sv2wcs (text); 1483 wchar_t *wstr = sv2wcs (text);
1411 int wlen = wcslen (wstr);
1412 int dlen = 0; 1484 int dlen = 0;
1413 1485
1414 // find length 1486 // find length
1415 for (wchar_t *s = wstr; *s; s++) 1487 for (wchar_t *s = wstr; *s; s++)
1416 if (*s == NOCHAR) 1488 if (*s == NOCHAR)
… …
1447# include "rsinc.h" 1519# include "rsinc.h"
1448# undef def 1520# undef def
1449# undef reserve 1521# undef reserve
1450 }; 1522 };
1451 1523
1452 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1524 rs = rslist + ecb_array_length (rslist);
1453 1525
1526 if (*name)
1454 do { 1527 {
1528 do {
1455 if (rs-- == rslist) 1529 if (rs-- == rslist)
1456 croak ("no such resource '%s', requested", name); 1530 croak ("no such resource '%s', requested", name);
1457 } while (strcmp (name, rs->name)); 1531 } while (strcmp (name, rs->name));
1458 1532
1459 index += rs->value; 1533 index += rs->value;
1534 }
1535 else
1536 {
1537 --rs;
1538 name = "";
1539 }
1460 1540
1461 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1541 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1462 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1542 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1463 1543
1464 if (GIMME_V != G_VOID) 1544 if (GIMME_V != G_VOID)
… …
1479 1559
1480const char * 1560const char *
1481rxvt_term::x_resource (const char *name) 1561rxvt_term::x_resource (const char *name)
1482 1562
1483bool 1563bool
1484rxvt_term::option (U32 optval, int set = -1) 1564rxvt_term::option (U8 optval, int set = -1)
1485 CODE: 1565 CODE:
1486{ 1566{
1487 RETVAL = THIS->options & optval; 1567 RETVAL = THIS->option (optval);
1488 1568
1489 if (set >= 0) 1569 if (set >= 0)
1490 { 1570 {
1491 if (set)
1492 THIS->options |= optval; 1571 THIS->set_option (optval, set);
1493 else
1494 THIS->options &= ~optval;
1495 1572
1496 if (THIS->check_ev.is_active ()) // avoid doing this before START 1573 if (THIS->init_done) // avoid doing this before START
1497 switch (optval) 1574 switch (optval)
1498 { 1575 {
1499 case Opt_skipBuiltinGlyphs: 1576 case Opt_skipBuiltinGlyphs:
1500 THIS->set_fonts (); 1577 THIS->set_fonts ();
1501 THIS->scr_remap_chars (); 1578 THIS->scr_remap_chars ();
1502 THIS->scr_touch (true); 1579 THIS->scr_touch (true);
1503 THIS->want_refresh = 1; 1580 THIS->want_refresh = 1;
1581 THIS->refresh_check ();
1504 break; 1582 break;
1583#ifdef CURSOR_BLINK
1584 case Opt_cursorBlink:
1585 THIS->cursor_blink_reset ();
1586 break;
1587#endif
1505 1588
1506 case Opt_cursorUnderline: 1589 case Opt_cursorUnderline:
1507 THIS->want_refresh = 1; 1590 THIS->want_refresh = 1;
1591 THIS->refresh_check ();
1508 break; 1592 break;
1509 1593
1510# case Opt_scrollBar_floating: 1594# case Opt_scrollBar_floating:
1511# case Opt_scrollBar_right: 1595# case Opt_scrollBar_right:
1512# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1596# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1522 CODE: 1606 CODE:
1523 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1607 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1524 THIS->keyboard->register_done (); 1608 THIS->keyboard->register_done ();
1525 OUTPUT: 1609 OUTPUT:
1526 RETVAL 1610 RETVAL
1611
1612void
1613rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1614 CODE:
1615 wchar_t *wstr = sv2wcs (str);
1616 THIS->keyboard->register_user_translation (keysym, state, wstr);
1617 free (wstr);
1527 1618
1528void 1619void
1529rxvt_term::screen_cur (...) 1620rxvt_term::screen_cur (...)
1530 PROTOTYPE: $;$$ 1621 PROTOTYPE: $;$$
1531 ALIAS: 1622 ALIAS:
… …
1545 EXTEND (SP, 2); 1636 EXTEND (SP, 2);
1546 PUSHs (sv_2mortal (newSViv (rc.row))); 1637 PUSHs (sv_2mortal (newSViv (rc.row)));
1547 PUSHs (sv_2mortal (newSViv (rc.col))); 1638 PUSHs (sv_2mortal (newSViv (rc.col)));
1548 } 1639 }
1549 1640
1550 if (items == 3) 1641 if (items >= 3)
1551 { 1642 {
1552 rc.row = SvIV (ST (1)); 1643 rc.row = SvIV (ST (1));
1553 rc.col = SvIV (ST (2)); 1644 rc.col = SvIV (ST (2));
1554 1645
1555 if (ix == 2) 1646 if (ix == 2)
… …
1570 1661
1571 clamp_it (rc.col, 0, THIS->ncol); 1662 clamp_it (rc.col, 0, THIS->ncol);
1572 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1663 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1573 1664
1574 if (ix) 1665 if (ix)
1666 {
1667 THIS->selection.screen = THIS->current_screen;
1668
1575 THIS->want_refresh = 1; 1669 THIS->want_refresh = 1;
1670 THIS->refresh_check ();
1576 } 1671 }
1672 }
1577} 1673}
1578 1674
1579char 1675int
1580rxvt_term::cur_charset () 1676rxvt_term::selection_screen (int screen = -1)
1581 CODE: 1677 CODE:
1582 RETVAL = THIS->charsets [THIS->screen.charset]; 1678 RETVAL = THIS->selection.screen;
1583 OUTPUT: 1679 if (screen >= 0)
1680 THIS->selection.screen = screen;
1681 OUTPUT:
1584 RETVAL 1682 RETVAL
1585 1683
1586void 1684void
1587rxvt_term::selection_clear () 1685rxvt_term::selection_clear (bool clipboard = false)
1588 1686
1589void 1687void
1590rxvt_term::selection_make (Time eventtime, bool rect = false) 1688rxvt_term::selection_make (Time eventtime, bool rect = false)
1591 CODE: 1689 CODE:
1592 THIS->selection.op = SELECTION_CONT; 1690 THIS->selection.op = SELECTION_CONT;
1593 THIS->selection.rect = rect; 1691 THIS->selection.rect = rect;
1594 THIS->selection_make (eventtime); 1692 THIS->selection_make (eventtime);
1595 1693
1596int 1694int
1597rxvt_term::selection_grab (Time eventtime) 1695rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1598 1696
1599void 1697void
1600rxvt_term::selection (SV *newtext = 0) 1698rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1601 PPCODE: 1699 PPCODE:
1602{ 1700{
1701 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1702 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1703
1603 if (GIMME_V != G_VOID) 1704 if (GIMME_V != G_VOID)
1604 XPUSHs (THIS->selection.text 1705 XPUSHs (text
1605 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1706 ? sv_2mortal (wcs2sv (text, len))
1606 : &PL_sv_undef); 1707 : &PL_sv_undef);
1607 1708
1608 if (newtext) 1709 if (newtext)
1609 { 1710 {
1610 free (THIS->selection.text); 1711 free (text);
1611 1712
1612 THIS->selection.text = sv2wcs (newtext); 1713 text = sv2wcs (newtext);
1613 THIS->selection.len = wcslen (THIS->selection.text); 1714 len = wcslen (text);
1614 } 1715 }
1615} 1716}
1717
1718char
1719rxvt_term::cur_charset ()
1720 CODE:
1721 RETVAL = THIS->charsets [THIS->screen.charset];
1722 OUTPUT:
1723 RETVAL
1616 1724
1617void 1725void
1618rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline) 1726rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
1619 1727
1620void 1728void
… …
1642 char *str = SvPVbyte (octets, len); 1750 char *str = SvPVbyte (octets, len);
1643 C_ARGS: 1751 C_ARGS:
1644 str, len 1752 str, len
1645 1753
1646void 1754void
1755rxvt_term::tt_paste (SV *octets)
1756 INIT:
1757 STRLEN len;
1758 char *str = SvPVbyte (octets, len);
1759 C_ARGS:
1760 str, len
1761
1762void
1647rxvt_term::cmd_parse (SV *octets) 1763rxvt_term::cmd_parse (SV *octets)
1648 CODE: 1764 CODE:
1649{ 1765{
1650 STRLEN len; 1766 STRLEN len;
1651 char *str = SvPVbyte (octets, len); 1767 char *str = SvPVbyte (octets, len);
… …
1687 Atom *props = XListProperties (THIS->dpy, window, &count); 1803 Atom *props = XListProperties (THIS->dpy, window, &count);
1688 1804
1689 EXTEND (SP, count); 1805 EXTEND (SP, count);
1690 while (count--) 1806 while (count--)
1691 PUSHs (newSVuv ((U32)props [count])); 1807 PUSHs (newSVuv ((U32)props [count]));
1692 1808
1693 XFree (props); 1809 XFree (props);
1694} 1810}
1695 1811
1696void 1812void
1697rxvt_term::XGetWindowProperty (Window window, Atom property) 1813rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1720 XFree (prop); 1836 XFree (prop);
1721 } 1837 }
1722} 1838}
1723 1839
1724void 1840void
1725rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1841rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1726 CODE: 1842 CODE:
1727{ 1843{
1728 STRLEN len; 1844 STRLEN len;
1729 char *data_ = SvPVbyte (data, len); 1845 char *data_ = SvPVbyte (data, len);
1730 1846
… …
1809 PUSHs (newSVuv (child)); 1925 PUSHs (newSVuv (child));
1810 } 1926 }
1811} 1927}
1812 1928
1813############################################################################# 1929#############################################################################
1930# fancy bg bloatstuff (TODO: should be moved up somewhere)
1931
1932#ifdef ENABLE_TRANSPARENCY
1933
1934# rxvt_img *
1935# rxvt_term::new_root_img ()
1936# CODE:
1937# RETVAL = rxvt_img::new_from_root (THIS);
1938# OUTPUT:
1939# RETVAL
1940
1941#endif
1942
1943#if HAVE_PIXBUF
1944
1945#endif
1946
1947#############################################################################
1814# urxvt::overlay 1948# urxvt::overlay
1815############################################################################# 1949#############################################################################
1816 1950
1817MODULE = urxvt PACKAGE = urxvt::overlay 1951MODULE = urxvt PACKAGE = urxvt::overlay
1818 1952
… …
1828void 1962void
1829overlay::DESTROY () 1963overlay::DESTROY ()
1830 1964
1831INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g | 1965INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1832 1966
1967MODULE = urxvt PACKAGE = urxvt::pixbuf PREFIX = gdk_pixbuf_
1968
1969#if HAVE_PIXBUF
1970
1971urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
1972 C_ARGS: filename, 0
1973
1974void
1975DESTROY (urxvt::pixbuf self)
1976 CODE:
1977 gdk_pixbuf_unref (self);
1978
1979#endif
1980
1981MODULE = urxvt PACKAGE = urxvt::img
1982
1983#if HAVE_IMG
1984
1985# rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
1986# rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
1987
1988void
1989rxvt_img::fill (SV *c)
1990 INIT:
1991 rxvt_color rc;
1992 parse_color (THIS->s, rc, c);
1993 C_ARGS: rc
1994
1995void
1996rxvt_img::blur (int rh, int rv)
1997
1998void
1999rxvt_img::brightness (double r, double g, double b, double a = 1.)
2000
2001void
2002rxvt_img::contrast (double r, double g, double b, double a = 1.)
2003
2004rxvt_img *
2005rxvt_img::copy ()
2006
2007rxvt_img *
2008rxvt_img::scale (int new_width, int new_height)
2009
2010# rxvt_img *
2011# rxvt_img::transform (int new_width, int new_height, double matrix[16]);
2012
2013#endif
2014

Diff Legend

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