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.104 by root, Mon Aug 7 22:28:18 2006 UTC vs.
Revision 1.152 by sf-exg, Thu Jan 19 13:33:43 2012 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtperl.xs 2 * File: rxvtperl.xs
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008,2011 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
23#define line_t perl_line_t 23#define line_t perl_line_t
24#include <EXTERN.h> 24#include <EXTERN.h>
25#include <perl.h> 25#include <perl.h>
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28#undef bool // perl defines it's own bool type, except with g++... what a trap
28 29
29#include "../config.h" 30#include "../config.h"
30 31
31#include <cstddef> 32#include <stddef.h>
32#include <cstdarg> 33#include <stdarg.h>
33 34
34#include "unistd.h" 35#include "unistd.h"
35 36
36#include "iom.h" 37#include "ev_cpp.h"
37#include "rxvt.h" 38#include "rxvt.h"
38#include "keyboard.h" 39#include "keyboard.h"
39#include "rxvtutil.h" 40#include "rxvtutil.h"
40#include "rxvtperl.h" 41#include "rxvtperl.h"
41 42
42#include "perlxsi.c" 43#include "perlxsi.c"
43 44
44#ifdef HAVE_SCROLLBARS
45# define GRAB_CURSOR THIS->leftptr_cursor 45#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
46#else
47# define GRAB_CURSOR None
48#endif
49 46
50#undef LINENO 47#undef LINENO
51#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
52#undef ROW 49#undef ROW
53#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
54 51
55typedef int CHAINED UNUSED;
56
57///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
58 53
59static wchar_t * 54static wchar_t *
60sv2wcs (SV *sv) 55sv2wcs (SV *sv)
61{ 56{
… …
75 70
76 return sv; 71 return sv;
77} 72}
78 73
79static SV * 74static SV *
80new_ref (HV *hv, const char *klass)
81{
82 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
83}
84
85static SV *
86newSVptr (void *ptr, const char *klass) 75newSVptr (void *ptr, const char *klass)
87{ 76{
88 HV *hv = newHV (); 77 HV *hv = newHV ();
89 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 78 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
90 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 79 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
117#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self) 106#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
118#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term") 107#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
119 108
120///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
121 110
122#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
123
124struct perl_watcher
125{
126 SV *cbsv;
127 HV *self;
128
129 perl_watcher ()
130 : cbsv (0)
131 {
132 }
133
134 ~perl_watcher ()
135 {
136 SvREFCNT_dec (cbsv);
137 }
138
139 void cb (SV *cb)
140 {
141 SvREFCNT_dec (cbsv);
142 cbsv = newSVsv (cb);
143 }
144
145 void invoke (const char *type, SV *self, int arg = -1);
146};
147
148void
149perl_watcher::invoke (const char *type, SV *self, int arg)
150{
151 dSP;
152
153 ENTER;
154 SAVETMPS;
155
156 PUSHMARK (SP);
157
158 XPUSHs (sv_2mortal (self));
159
160 if (arg >= 0)
161 XPUSHs (sv_2mortal (newSViv (arg)));
162
163 PUTBACK;
164 call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
165 SPAGAIN;
166
167 PUTBACK;
168 FREETMPS;
169 LEAVE;
170
171 if (SvTRUE (ERRSV))
172 rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
173}
174
175#define newSVtimer(timer) new_ref ((timer)->self, "urxvt::timer")
176#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR ((sv), "urxvt::timer")
177
178struct timer : perl_watcher, time_watcher
179{
180 tstamp interval;
181
182 timer ()
183 : time_watcher (this, &timer::execute)
184 {
185 }
186
187 void execute (time_watcher &w)
188 {
189 if (interval)
190 start (at + interval);
191
192 invoke ("urxvt::timer", newSVtimer (this));
193 }
194};
195
196#define newSViow(iow) new_ref ((iow)->self, "urxvt::iow")
197#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR ((sv), "urxvt::iow")
198
199struct iow : perl_watcher, io_watcher
200{
201 iow ()
202 : io_watcher (this, &iow::execute)
203 {
204 }
205
206 void execute (io_watcher &w, short revents)
207 {
208 invoke ("urxvt::iow", newSViow (this), revents);
209 }
210};
211
212#define newSViw(iw) new_ref ((iw)->self, "urxvt::iw")
213#define SvIW(sv) (iw *)(perl_watcher *)SvPTR ((sv), "urxvt::iw")
214
215struct iw : perl_watcher, idle_watcher
216{
217 iw ()
218 : idle_watcher (this, &iw::execute)
219 {
220 }
221
222 void execute (idle_watcher &w)
223 {
224 invoke ("urxvt::iw", newSViw (this));
225 }
226};
227
228#define newSVpw(pw) new_ref ((pw)->self, "urxvt::pw")
229#define SvPW(sv) (pw *)(perl_watcher *)SvPTR ((sv), "urxvt::pw")
230
231struct pw : perl_watcher, child_watcher
232{
233 pw ()
234 : child_watcher (this, &pw::execute)
235 {
236 }
237
238 void execute (child_watcher &w, int status)
239 {
240 invoke ("urxvt::pw", newSVpw (this), status);
241 }
242};
243
244/////////////////////////////////////////////////////////////////////////////
245
246#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 111#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
247 112
248class overlay { 113class overlay : overlay_base
114{
249 rxvt_term *THIS; 115 rxvt_term *THIS;
250 AV *overlay_av; 116 AV *overlay_av;
251 int x, y, w, h;
252 int border; 117 int border;
253 text_t **text;
254 rend_t **rend;
255 118
256public: 119public:
257 HV *self; 120 HV *self;
258 121
259 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 122 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
266 129
267 void set (int x, int y, SV *str, SV *rend); 130 void set (int x, int y, SV *str, SV *rend);
268}; 131};
269 132
270overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 133overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
271: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 134: THIS(THIS), border(border == 2), overlay_av (0)
272{ 135{
136 x = x_;
137 y = y_;
138 w = w_;
139 h = h_;
140
273 if (w < 0) w = 0; 141 if (w < 0) w = 0;
274 if (h < 0) h = 0; 142 if (h < 0) h = 0;
275 143
276 if (border == 2) 144 if (border == 2)
277 { 145 {
… …
346 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0) 214 *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
347 )); 215 ));
348 av_push (overlay_av, newSViv ((long)this)); 216 av_push (overlay_av, newSViv ((long)this));
349 217
350 THIS->want_refresh = 1; 218 THIS->want_refresh = 1;
219 THIS->refresh_check ();
351} 220}
352 221
353void 222void
354overlay::hide () 223overlay::hide ()
355{ 224{
… …
369 238
370 SvREFCNT_dec (overlay_av); 239 SvREFCNT_dec (overlay_av);
371 overlay_av = 0; 240 overlay_av = 0;
372 241
373 THIS->want_refresh = 1; 242 THIS->want_refresh = 1;
243 THIS->refresh_check ();
374} 244}
375 245
376void overlay::swap () 246void overlay::swap ()
377{ 247{
378 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 248 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
379 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 249 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
380 250
381 int ov_w = min (w, THIS->ncol - ov_x); 251 int ov_w = min (w, THIS->ncol - ov_x);
382 int ov_h = min (h, THIS->nrow - ov_y); 252 int ov_h = min (h, THIS->nrow - ov_y);
253
254 // hide cursor if it is within the overlay area
255 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
256 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
257 THIS->screen.flags &= ~Screen_VisibleCursor;
383 258
384 for (int y = ov_h; y--; ) 259 for (int y = ov_h; y--; )
385 { 260 {
386 text_t *t1 = text [y]; 261 text_t *t1 = text [y];
387 rend_t *r1 = rend [y]; 262 rend_t *r1 = rend [y];
… …
423 for (int col = min (AvFILL (av) + 1, w - x - border); col--; ) 298 for (int col = min (AvFILL (av) + 1, w - x - border); col--; )
424 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1)); 299 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
425 } 300 }
426 301
427 THIS->want_refresh = 1; 302 THIS->want_refresh = 1;
303 THIS->refresh_check ();
428} 304}
429 305
306/////////////////////////////////////////////////////////////////////////////
307
308#include "iom_perl.h"
430 309
431///////////////////////////////////////////////////////////////////////////// 310/////////////////////////////////////////////////////////////////////////////
432 311
433struct rxvt_perl_interp rxvt_perl; 312struct rxvt_perl_interp rxvt_perl;
434 313
… …
438{ 317{
439 if (perl) 318 if (perl)
440 { 319 {
441 perl_destruct (perl); 320 perl_destruct (perl);
442 perl_free (perl); 321 perl_free (perl);
322 PERL_SYS_TERM ();
443 } 323 }
444} 324}
445 325
446void 326void
447rxvt_perl_interp::init (rxvt_term *term) 327rxvt_perl_interp::init (rxvt_term *term)
448{ 328{
449 if (!perl) 329 if (!perl)
450 { 330 {
451 rxvt_push_locale (""); // perl init destroys current locale 331 rxvt_push_locale (""); // perl init destroys current locale
452 332
333 {
453 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
454 swap (perl_environ, environ); 335 localise_env set_environ (perl_environ);
455 336
456 char *argv[] = { 337 char *args[] = {
457 "", 338 "",
458 "-e" 339 "-e"
459 "BEGIN {" 340 "BEGIN {"
460 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
461 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
462 "}" 343 "}"
463 "" 344 ""
464 "use urxvt;" 345 "use urxvt;"
465 }; 346 };
347 int argc = ecb_array_length (args);
348 char **argv = args;
466 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
467 perl = perl_alloc (); 351 perl = perl_alloc ();
468 perl_construct (perl); 352 perl_construct (perl);
469 353
470 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
471 || perl_run (perl)) 355 || perl_run (perl))
472 { 356 {
473 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
474 358
475 perl_destruct (perl); 359 perl_destruct (perl);
476 perl_free (perl); 360 perl_free (perl);
477 perl = 0; 361 perl = 0;
478 } 362 }
479 363 }
480 swap (perl_environ, environ);
481 364
482 rxvt_pop_locale (); 365 rxvt_pop_locale ();
483 } 366 }
484 367
485 if (perl) 368 if (perl)
486 { 369 {
487 // runs outside of perls ENV 370 // runs outside of perls ENV
488 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term"); 371 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
489 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0); 372 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newAV ()), 0);
373 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, newRV_noinc ((SV *)newAV ()), 0);
490 } 374 }
491} 375}
492 376
493static void 377static void
494ungrab (rxvt_term *THIS) 378ungrab (rxvt_term *THIS)
… …
505rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 389rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
506{ 390{
507 if (!perl || !term->perl.self) 391 if (!perl || !term->perl.self)
508 return false; 392 return false;
509 393
394 localise_env set_environ (perl_environ);
395
510 // pre-handling of some events 396 // pre-handling of some events
511 if (htype == HOOK_REFRESH_END) 397 if (htype == HOOK_REFRESH_END)
512 { 398 {
513 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 399 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
514 400
515 for (int i = 0; i <= AvFILL (av); i++) 401 for (int i = 0; i <= AvFILL (av); i++)
516 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 402 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
517 } 403 }
404 else if (htype == HOOK_DESTROY)
405 {
406 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
518 407
519 swap (perl_environ, environ); 408 for (int i = AvFILL (av); i >= 0; i--)
409 {
410 rxvt_selection *req = (rxvt_selection *)SvIV (*av_fetch (av, i, 0));
411 delete req;
412 }
413 }
520 414
521 bool event_consumed; 415 bool event_consumed;
522 416
523 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always 417 if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
524 || term->perl.should_invoke [htype]) 418 || term->perl.should_invoke [htype])
525 try
526 { 419 {
527 dSP; 420 dSP;
528 va_list ap; 421 va_list ap;
529 422
530 va_start (ap, htype); 423 va_start (ap, htype);
531 424
532 ENTER; 425 ENTER;
533 SAVETMPS; 426 SAVETMPS;
534 427
535 PUSHMARK (SP); 428 PUSHMARK (SP);
536 429
430 EXTEND (SP, 2);
537 XPUSHs (sv_2mortal (newSVterm (term))); 431 PUSHs (sv_2mortal (newSVterm (term)));
538 XPUSHs (sv_2mortal (newSViv (htype))); 432 PUSHs (sv_2mortal (newSViv (htype)));
539 433
540 for (;;) { 434 for (;;) {
541 data_type dt = (data_type)va_arg (ap, int); 435 data_type dt = (data_type)va_arg (ap, int);
542 436
543 switch (dt) 437 switch (dt)
544 { 438 {
545 case DT_INT: 439 case DT_INT:
546 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int)))); 440 XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
547 break; 441 break;
548 442
549 case DT_LONG: 443 case DT_LONG:
550 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 444 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
551 break; 445 break;
552 446
553 case DT_STR: 447 case DT_STR:
554 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 448 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
555 break; 449 break;
556 450
557 case DT_STR_LEN: 451 case DT_STR_LEN:
558 { 452 {
559 char *str = va_arg (ap, char *); 453 char *str = va_arg (ap, char *);
560 int len = va_arg (ap, int); 454 int len = va_arg (ap, int);
561 455
562 XPUSHs (sv_2mortal (newSVpvn (str, len))); 456 XPUSHs (sv_2mortal (newSVpvn (str, len)));
563 } 457 }
564 break; 458 break;
565 459
566 case DT_WCS_LEN: 460 case DT_WCS_LEN:
567 { 461 {
568 wchar_t *wstr = va_arg (ap, wchar_t *); 462 wchar_t *wstr = va_arg (ap, wchar_t *);
569 int wlen = va_arg (ap, int); 463 int wlen = va_arg (ap, int);
570 464
571 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 465 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
572 } 466 }
573 break; 467 break;
574 468
575 case DT_LCS_LEN: 469 case DT_LCS_LEN:
576 { 470 {
577 long *lstr = va_arg (ap, long *); 471 long *lstr = va_arg (ap, long *);
578 int llen = va_arg (ap, int); 472 int llen = va_arg (ap, int);
579 473
580 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long)))); 474 XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
581 } 475 }
582 break; 476 break;
583 477
584 case DT_XEVENT: 478 case DT_XEVENT:
585 { 479 {
586 XEvent *xe = va_arg (ap, XEvent *); 480 XEvent *xe = va_arg (ap, XEvent *);
587 HV *hv = newHV (); 481 HV *hv = newHV ();
588 482
589# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0) 483# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
590# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0) 484# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
591# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0) 485# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
592# undef set 486# undef set
593 487
594 setiv (type, xe->type); 488 setiv (type, xe->type);
595 setiv (send_event, xe->xany.send_event); 489 setiv (send_event, xe->xany.send_event);
596 setiv (serial, xe->xany.serial); 490 setiv (serial, xe->xany.serial);
597 491
598 switch (xe->type) 492 switch (xe->type)
599 { 493 {
600 case KeyPress: 494 case KeyPress:
601 case KeyRelease: 495 case KeyRelease:
602 case ButtonPress: 496 case ButtonPress:
603 case ButtonRelease: 497 case ButtonRelease:
604 case MotionNotify: 498 case MotionNotify:
605 setuv (window, xe->xmotion.window); 499 setuv (window, xe->xmotion.window);
606 setuv (root, xe->xmotion.root); 500 setuv (root, xe->xmotion.root);
607 setuv (subwindow, xe->xmotion.subwindow); 501 setuv (subwindow, xe->xmotion.subwindow);
608 setuv (time, xe->xmotion.time); 502 setuv (time, xe->xmotion.time);
609 setiv (x, xe->xmotion.x); 503 setiv (x, xe->xmotion.x);
610 setiv (y, xe->xmotion.y); 504 setiv (y, xe->xmotion.y);
611 setiv (row, xe->xmotion.y / term->fheight + term->view_start); 505 setiv (row, xe->xmotion.y / term->fheight + term->view_start);
612 setiv (col, xe->xmotion.x / term->fwidth); 506 setiv (col, xe->xmotion.x / term->fwidth);
613 setiv (x_root, xe->xmotion.x_root); 507 setiv (x_root, xe->xmotion.x_root);
614 setiv (y_root, xe->xmotion.y_root); 508 setiv (y_root, xe->xmotion.y_root);
615 setuv (state, xe->xmotion.state); 509 setuv (state, xe->xmotion.state);
616 510
617 switch (xe->type) 511 switch (xe->type)
618 { 512 {
619 case KeyPress: 513 case KeyPress:
620 case KeyRelease: 514 case KeyRelease:
621 setuv (keycode, xe->xkey.keycode); 515 setuv (keycode, xe->xkey.keycode);
622 break; 516 break;
623 517
624 case ButtonPress: 518 case ButtonPress:
625 case ButtonRelease: 519 case ButtonRelease:
626 setuv (button, xe->xbutton.button); 520 setuv (button, xe->xbutton.button);
627 break; 521 break;
628 522
629 case MotionNotify: 523 case MotionNotify:
630 setiv (is_hint, xe->xmotion.is_hint); 524 setiv (is_hint, xe->xmotion.is_hint);
631 break; 525 break;
632 } 526 }
633 527
634 break; 528 break;
635 529
636 case MapNotify: 530 case MapNotify:
637 case UnmapNotify: 531 case UnmapNotify:
638 case ConfigureNotify: 532 case ConfigureNotify:
639 setuv (event, xe->xconfigure.event); 533 setuv (event, xe->xconfigure.event);
640 setuv (window, xe->xconfigure.window); 534 setuv (window, xe->xconfigure.window);
641 535
642 switch (xe->type) 536 switch (xe->type)
643 { 537 {
644 case ConfigureNotify: 538 case ConfigureNotify:
645 setiv (x, xe->xconfigure.x); 539 setiv (x, xe->xconfigure.x);
646 setiv (y, xe->xconfigure.y); 540 setiv (y, xe->xconfigure.y);
647 setiv (width, xe->xconfigure.width); 541 setiv (width, xe->xconfigure.width);
648 setiv (height, xe->xconfigure.height); 542 setiv (height, xe->xconfigure.height);
649 setuv (above, xe->xconfigure.above); 543 setuv (above, xe->xconfigure.above);
650 break; 544 break;
651 } 545 }
652 546
653 break; 547 break;
654 548
655 case PropertyNotify: 549 case PropertyNotify:
656 setuv (window, xe->xproperty.window); 550 setuv (window, xe->xproperty.window);
657 setuv (atom, xe->xproperty.atom); 551 setuv (atom, xe->xproperty.atom);
658 setuv (time, xe->xproperty.time); 552 setuv (time, xe->xproperty.time);
659 setiv (state, xe->xproperty.state); 553 setiv (state, xe->xproperty.state);
660 break; 554 break;
661 555
662 case ClientMessage: 556 case ClientMessage:
663 setuv (window, xe->xclient.window); 557 setuv (window, xe->xclient.window);
664 setuv (message_type, xe->xclient.message_type); 558 setuv (message_type, xe->xclient.message_type);
665 setuv (format, xe->xclient.format); 559 setuv (format, xe->xclient.format);
666 setuv (l0, xe->xclient.data.l[0]); 560 setuv (l0, xe->xclient.data.l[0]);
667 setuv (l1, xe->xclient.data.l[1]); 561 setuv (l1, xe->xclient.data.l[1]);
668 setuv (l2, xe->xclient.data.l[2]); 562 setuv (l2, xe->xclient.data.l[2]);
669 setuv (l3, xe->xclient.data.l[3]); 563 setuv (l3, xe->xclient.data.l[3]);
670 setuv (l4, xe->xclient.data.l[4]); 564 setuv (l4, xe->xclient.data.l[4]);
671 break; 565 break;
672 } 566 }
673 567
674 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 568 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
675 } 569 }
676 break; 570 break;
677 571
678 case DT_END: 572 case DT_END:
679 goto call; 573 goto call;
680 574
681 default: 575 default:
682 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt); 576 rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
683 } 577 }
578 }
579
580 call:
581 va_end (ap);
582
583 PUTBACK;
584 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
585 SPAGAIN;
586
587 if (count)
588 {
589 SV *status = POPs;
590 count = SvTRUE (status);
684 } 591 }
685 592
686 call:
687 va_end (ap);
688
689 PUTBACK; 593 PUTBACK;
690 int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
691 SPAGAIN;
692
693 if (count)
694 {
695 SV *status = POPs;
696 count = SvTRUE (status);
697 }
698
699 PUTBACK;
700 FREETMPS; 594 FREETMPS;
701 LEAVE; 595 LEAVE;
702 596
703 if (SvTRUE (ERRSV)) 597 if (SvTRUE (ERRSV))
704 { 598 {
705 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 599 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPVbyte_nolen (ERRSV));
706 ungrab (term); // better lose the grab than the session 600 ungrab (term); // better lose the grab than the session
707 } 601 }
708 602
709 event_consumed = !!count; 603 event_consumed = !!count;
710 } 604 }
711 catch (...)
712 {
713 swap (perl_environ, environ);
714 throw;
715 }
716 else 605 else
717 event_consumed = false; 606 event_consumed = false;
718 607
719 // post-handling of some events 608 // post-handling of some events
720 if (htype == HOOK_REFRESH_BEGIN) 609 if (htype == HOOK_REFRESH_BEGIN)
721 { 610 {
722 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); 611 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
723 612
724 for (int i = AvFILL (av); i >= 0; i--) 613 for (int i = AvFILL (av); i >= 0; i--)
725 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); 614 ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
726 } 615 }
727 else if (htype == HOOK_DESTROY) 616 else if (htype == HOOK_DESTROY)
728 { 617 {
729 clearSVptr ((SV *)term->perl.self); 618 clearSVptr ((SV *)term->perl.self);
730 SvREFCNT_dec ((SV *)term->perl.self); 619 SvREFCNT_dec ((SV *)term->perl.self);
731 620
732 // don't allow further calls 621 // don't allow further calls
733 term->perl.self = 0; 622 term->perl.self = 0;
734 } 623 }
735 624
736 swap (perl_environ, environ);
737
738 return event_consumed; 625 return event_consumed;
626}
627
628void
629rxvt_perl_interp::selection_finish (rxvt_selection *sel, char *data, unsigned int len)
630{
631 localise_env set_environ (perl_environ);
632
633 ENTER;
634 SAVETMPS;
635
636 dSP;
637 XPUSHs (sv_2mortal (newSVpvn (data, len)));
638 call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
639
640 if (SvTRUE (ERRSV))
641 rxvt_warn ("perl selection callback evaluation error: %s", SvPVbyte_nolen (ERRSV));
642
643 FREETMPS;
644 LEAVE;
739} 645}
740 646
741///////////////////////////////////////////////////////////////////////////// 647/////////////////////////////////////////////////////////////////////////////
742 648
743MODULE = urxvt PACKAGE = urxvt 649MODULE = urxvt PACKAGE = urxvt
… …
755# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0)); 661# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
756# include "hookinc.h" 662# include "hookinc.h"
757# undef def 663# undef def
758 664
759 HV *option = get_hv ("urxvt::OPTION", 1); 665 HV *option = get_hv ("urxvt::OPTION", 1);
760# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0); 666# define def(name) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
761# define nodef(name) 667# define nodef(name)
762# include "optinc.h" 668# include "optinc.h"
763# undef nodef 669# undef nodef
764# undef def 670# undef def
765 671
… …
767 static const struct { 673 static const struct {
768 const char *name; 674 const char *name;
769 IV iv; 675 IV iv;
770 } *civ, const_iv[] = { 676 } *civ, const_iv[] = {
771# define const_iv(name) { # name, (IV)name } 677# define const_iv(name) { # name, (IV)name }
678 const_iv (NUM_RESOURCES),
772 const_iv (DEFAULT_RSTYLE), 679 const_iv (DEFAULT_RSTYLE),
773 const_iv (OVERLAY_RSTYLE), 680 const_iv (OVERLAY_RSTYLE),
681 const_iv (Color_Bits),
682 const_iv (RS_bgShift), const_iv (RS_bgMask),
683 const_iv (RS_fgShift), const_iv (RS_fgMask),
684 const_iv (RS_Careful),
685 const_iv (RS_fontCount),
686 const_iv (RS_fontShift),
687 const_iv (RS_fontMask),
688 const_iv (RS_baseattrMask),
689 const_iv (RS_attrMask),
690 const_iv (RS_redraw),
691 const_iv (RS_Sel),
774 const_iv (RS_Bold), 692 const_iv (RS_Bold),
775 const_iv (RS_Italic), 693 const_iv (RS_Italic),
776 const_iv (RS_Blink), 694 const_iv (RS_Blink),
777 const_iv (RS_RVid), 695 const_iv (RS_RVid),
778 const_iv (RS_Uline), 696 const_iv (RS_Uline),
… …
794 const_iv (AnyModifier), 712 const_iv (AnyModifier),
795 713
796 const_iv (NoSymbol), 714 const_iv (NoSymbol),
797 const_iv (GrabModeSync), 715 const_iv (GrabModeSync),
798 const_iv (GrabModeAsync), 716 const_iv (GrabModeAsync),
799
800 const_iv (EVENT_NONE),
801 const_iv (EVENT_READ),
802 const_iv (EVENT_WRITE),
803 717
804 const_iv (NoEventMask), 718 const_iv (NoEventMask),
805 const_iv (KeyPressMask), 719 const_iv (KeyPressMask),
806 const_iv (KeyReleaseMask), 720 const_iv (KeyReleaseMask),
807 const_iv (ButtonPressMask), 721 const_iv (ButtonPressMask),
… …
886 const_iv (XIMDontChange), 800 const_iv (XIMDontChange),
887# endif 801# endif
888# endif 802# endif
889 }; 803 };
890 804
891 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 805 for (civ = const_iv + ecb_array_length (const_iv); civ > const_iv; civ--)
892 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 806 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
893} 807}
894 808
895void 809void
896warn (const char *msg) 810warn (const char *msg)
897 CODE: 811 CODE:
… …
906_exit (int status) 820_exit (int status)
907 821
908NV 822NV
909NOW () 823NOW ()
910 CODE: 824 CODE:
911 RETVAL = NOW; 825 RETVAL = ev::now ();
912 OUTPUT: 826 OUTPUT:
913 RETVAL 827 RETVAL
914 828
915int 829int
916GET_BASEFG (int rend) 830GET_BASEFG (int rend)
… …
941 RETVAL 855 RETVAL
942 856
943int 857int
944GET_CUSTOM (int rend) 858GET_CUSTOM (int rend)
945 CODE: 859 CODE:
946 RETVAL = (rend && RS_customMask) >> RS_customShift; 860 RETVAL = (rend & RS_customMask) >> RS_customShift;
947 OUTPUT: 861 OUTPUT:
948 RETVAL 862 RETVAL
949 863
950int 864int
951SET_CUSTOM (int rend, int new_value) 865SET_CUSTOM (int rend, int new_value)
… …
969 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 883 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
970 if ((*t)->perl.self) 884 if ((*t)->perl.self)
971 PUSHs (sv_2mortal (newSVterm (*t))); 885 PUSHs (sv_2mortal (newSVterm (*t)));
972} 886}
973 887
888IV
889_new_selection_request (rxvt_term *term, int selnum, Time tm, Window win, Atom prop, SV *cb)
890 CODE:
891 rxvt_selection *req = new rxvt_selection (term->display, selnum, tm, win, prop, term);
892 req->cb_sv = newSVsv (cb);
893 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_selection", 10, 0));
894 av_push (av, newSViv ((IV)req));
895 RETVAL = (IV)req;
896 OUTPUT:
897 RETVAL
898
899void
900_delete_selection_request (IV req_)
901 CODE:
902 rxvt_selection *req = (rxvt_selection *)req_;
903 AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)req->term->perl.self), "_selection", 10, 0));
904 int i;
905
906 for (i = AvFILL (av); i >= 0; i--)
907 if (SvIV (*av_fetch (av, i, 1)) == req_)
908 break;
909
910 for (; i < AvFILL (av); i++)
911 av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
912
913 av_pop (av);
914
915 delete req;
916
974MODULE = urxvt PACKAGE = urxvt::term 917MODULE = urxvt PACKAGE = urxvt::term
975 918
976SV * 919SV *
977_new (AV *env, AV *arg) 920_new (AV *env, AV *arg)
978 CODE: 921 CODE:
979{ 922{
980 rxvt_term *term = new rxvt_term; 923 rxvt_term *term = new rxvt_term;
981 924
982 stringvec *argv = new stringvec; 925 stringvec *argv = new stringvec;
983 stringvec *envv = new stringvec;
984
985 for (int i = 0; i <= AvFILL (arg); i++) 926 for (int i = 0; i <= AvFILL (arg); i++)
986 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1)))); 927 argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
987 928
929 stringvec *envv = new stringvec;
988 for (int i = AvFILL (env) + 1; i--; ) 930 for (int i = AvFILL (env) + 1; i--; )
989 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); 931 envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
990 932
991 envv->push_back (0);
992
993 bool success;
994
995 try 933 try
996 { 934 {
997 success = term->init (argv, envv); 935 term->init (argv, envv);
998 } 936 }
999 catch (const class rxvt_failure_exception &e) 937 catch (const class rxvt_failure_exception &e)
1000 {
1001 success = false;
1002 }
1003
1004 if (!success)
1005 { 938 {
1006 term->destroy (); 939 term->destroy ();
1007 croak ("error while initializing new terminal instance"); 940 croak ("error while initializing new terminal instance");
1008 } 941 }
1009 942
… …
1043 976
1044void 977void
1045rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt) 978rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
1046 CODE: 979 CODE:
1047 XUngrabKey (THIS->dpy, keycode, modifiers, window); 980 XUngrabKey (THIS->dpy, keycode, modifiers, window);
1048
1049void
1050rxvt_term::XUngrabKeyboard (Time eventtime)
1051 CODE:
1052 XUngrabKeyboard (THIS->dpy, eventtime);
1053 981
1054bool 982bool
1055rxvt_term::grab (Time eventtime, int sync = 0) 983rxvt_term::grab (Time eventtime, int sync = 0)
1056 CODE: 984 CODE:
1057{ 985{
… …
1122 CODE: 1050 CODE:
1123{ 1051{
1124 wchar_t *wstr = sv2wcs (str); 1052 wchar_t *wstr = sv2wcs (str);
1125 1053
1126 rxvt_push_locale (THIS->locale); 1054 rxvt_push_locale (THIS->locale);
1127 //TODO: use same algorithm as screen.C 1055 RETVAL = 0;
1128 RETVAL = wcswidth (wstr, wcslen (wstr)); 1056 for (wchar_t *wc = wstr; *wc; wc++)
1057 {
1058 int w = WCWIDTH (*wc);
1059
1060 if (w)
1061 RETVAL += max (w, 1);
1062 }
1129 rxvt_pop_locale (); 1063 rxvt_pop_locale ();
1130 1064
1131 free (wstr); 1065 free (wstr);
1132} 1066}
1133 OUTPUT: 1067 OUTPUT:
… …
1168 OUTPUT: 1102 OUTPUT:
1169 RETVAL 1103 RETVAL
1170 1104
1171#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1105#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1172 1106
1173#define TERM_OFFSET_width TERM_OFFSET(width) 1107#define TERM_OFFSET_width TERM_OFFSET(width)
1174#define TERM_OFFSET_height TERM_OFFSET(height) 1108#define TERM_OFFSET_height TERM_OFFSET(height)
1175#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1109#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1176#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1110#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1177#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1111#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1178#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1112#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1179#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1113#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1180#define TERM_OFFSET_focus TERM_OFFSET(focus) 1114#define TERM_OFFSET_focus TERM_OFFSET(focus)
1181#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1115#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1182#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1116#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1183#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1117#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1184#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1118#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1119#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1185#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1120#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1186#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1121#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1187#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1122#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1188 1123
1189int 1124int
1190rxvt_term::width () 1125rxvt_term::width ()
1191 ALIAS: 1126 ALIAS:
1192 width = TERM_OFFSET_width 1127 width = TERM_OFFSET_width
1193 height = TERM_OFFSET_height 1128 height = TERM_OFFSET_height
1194 fwidth = TERM_OFFSET_fwidth 1129 fwidth = TERM_OFFSET_fwidth
1195 fheight = TERM_OFFSET_fheight 1130 fheight = TERM_OFFSET_fheight
1196 fbase = TERM_OFFSET_fbase 1131 fbase = TERM_OFFSET_fbase
1197 nrow = TERM_OFFSET_nrow 1132 nrow = TERM_OFFSET_nrow
1198 ncol = TERM_OFFSET_ncol 1133 ncol = TERM_OFFSET_ncol
1199 focus = TERM_OFFSET_focus 1134 focus = TERM_OFFSET_focus
1200 mapped = TERM_OFFSET_mapped 1135 mapped = TERM_OFFSET_mapped
1201 int_bwidth = TERM_OFFSET_int_bwidth 1136 int_bwidth = TERM_OFFSET_int_bwidth
1202 ext_bwidth = TERM_OFFSET_ext_bwidth 1137 ext_bwidth = TERM_OFFSET_ext_bwidth
1203 lineSpace = TERM_OFFSET_lineSpace 1138 lineSpace = TERM_OFFSET_lineSpace
1139 letterSpace = TERM_OFFSET_letterSpace
1204 saveLines = TERM_OFFSET_saveLines 1140 saveLines = TERM_OFFSET_saveLines
1205 total_rows = TERM_OFFSET_total_rows 1141 total_rows = TERM_OFFSET_total_rows
1206 top_row = TERM_OFFSET_top_row 1142 top_row = TERM_OFFSET_top_row
1207 CODE: 1143 CODE:
1208 RETVAL = *(int *)((char *)THIS + ix); 1144 RETVAL = *(int *)((char *)THIS + ix);
1209 OUTPUT: 1145 OUTPUT:
1210 RETVAL 1146 RETVAL
1211 1147
… …
1222 { 1158 {
1223 case 0: RETVAL = THIS->ModLevel3Mask; break; 1159 case 0: RETVAL = THIS->ModLevel3Mask; break;
1224 case 1: RETVAL = THIS->ModMetaMask; break; 1160 case 1: RETVAL = THIS->ModMetaMask; break;
1225 case 2: RETVAL = THIS->ModNumLockMask; break; 1161 case 2: RETVAL = THIS->ModNumLockMask; break;
1226 case 3: RETVAL = THIS->current_screen; break; 1162 case 3: RETVAL = THIS->current_screen; break;
1163#ifdef CURSOR_BLINK
1227 case 4: RETVAL = THIS->hidden_cursor; break; 1164 case 4: RETVAL = THIS->hidden_cursor; break;
1165#endif
1228 } 1166 }
1229 OUTPUT: 1167 OUTPUT:
1230 RETVAL 1168 RETVAL
1231 1169
1232char * 1170char *
… …
1257 if (*i) 1195 if (*i)
1258 PUSHs (sv_2mortal (newSVpv (*i, 0))); 1196 PUSHs (sv_2mortal (newSVpv (*i, 0)));
1259} 1197}
1260 1198
1261int 1199int
1262rxvt_term::pty_ev_events (int events = EVENT_UNDEF) 1200rxvt_term::pty_ev_events (int events = ev::UNDEF)
1263 CODE: 1201 CODE:
1264 RETVAL = THIS->pty_ev.events; 1202 RETVAL = THIS->pty_ev.events;
1265 if (events != EVENT_UNDEF) 1203 if (events != ev::UNDEF)
1266 THIS->pty_ev.set (events); 1204 THIS->pty_ev.set (events);
1267 OUTPUT: 1205 OUTPUT:
1268 RETVAL 1206 RETVAL
1269 1207
1270int 1208int
… …
1275 RETVAL 1213 RETVAL
1276 1214
1277Window 1215Window
1278rxvt_term::parent () 1216rxvt_term::parent ()
1279 CODE: 1217 CODE:
1280 RETVAL = THIS->parent [0]; 1218 RETVAL = THIS->parent;
1281 OUTPUT: 1219 OUTPUT:
1282 RETVAL 1220 RETVAL
1283 1221
1284Window 1222Window
1285rxvt_term::vt () 1223rxvt_term::vt ()
… …
1312 if (newval <= 0) 1250 if (newval <= 0)
1313 THIS->scr_changeview (max (newval, THIS->top_row)); 1251 THIS->scr_changeview (max (newval, THIS->top_row));
1314} 1252}
1315 OUTPUT: 1253 OUTPUT:
1316 RETVAL 1254 RETVAL
1255
1256void
1257rxvt_term::set_urgency (bool enable)
1317 1258
1318void 1259void
1319rxvt_term::focus_in () 1260rxvt_term::focus_in ()
1320 1261
1321void 1262void
… …
1349 1290
1350void 1291void
1351rxvt_term::want_refresh () 1292rxvt_term::want_refresh ()
1352 CODE: 1293 CODE:
1353 THIS->want_refresh = 1; 1294 THIS->want_refresh = 1;
1295 THIS->refresh_check ();
1354 1296
1355void 1297void
1356rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS) 1298rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
1357 PPCODE: 1299 PPCODE:
1358{ 1300{
… …
1513SV * 1455SV *
1514rxvt_term::special_decode (SV *text) 1456rxvt_term::special_decode (SV *text)
1515 CODE: 1457 CODE:
1516{ 1458{
1517 wchar_t *wstr = sv2wcs (text); 1459 wchar_t *wstr = sv2wcs (text);
1518 int wlen = wcslen (wstr);
1519 int dlen = 0; 1460 int dlen = 0;
1520 1461
1521 // find length 1462 // find length
1522 for (wchar_t *s = wstr; *s; s++) 1463 for (wchar_t *s = wstr; *s; s++)
1523 if (*s == NOCHAR) 1464 if (*s == NOCHAR)
… …
1554# include "rsinc.h" 1495# include "rsinc.h"
1555# undef def 1496# undef def
1556# undef reserve 1497# undef reserve
1557 }; 1498 };
1558 1499
1559 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1500 rs = rslist + ecb_array_length (rslist);
1560 1501
1502 if (*name)
1561 do { 1503 {
1504 do {
1562 if (rs-- == rslist) 1505 if (rs-- == rslist)
1563 croak ("no such resource '%s', requested", name); 1506 croak ("no such resource '%s', requested", name);
1564 } while (strcmp (name, rs->name)); 1507 } while (strcmp (name, rs->name));
1565 1508
1566 index += rs->value; 1509 index += rs->value;
1510 }
1511 else
1512 {
1513 --rs;
1514 name = "";
1515 }
1567 1516
1568 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1517 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1569 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1518 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1570 1519
1571 if (GIMME_V != G_VOID) 1520 if (GIMME_V != G_VOID)
… …
1586 1535
1587const char * 1536const char *
1588rxvt_term::x_resource (const char *name) 1537rxvt_term::x_resource (const char *name)
1589 1538
1590bool 1539bool
1591rxvt_term::option (U32 optval, int set = -1) 1540rxvt_term::option (U8 optval, int set = -1)
1592 CODE: 1541 CODE:
1593{ 1542{
1594 RETVAL = THIS->options & optval; 1543 RETVAL = THIS->option (optval);
1595 1544
1596 if (set >= 0) 1545 if (set >= 0)
1597 { 1546 {
1598 if (set)
1599 THIS->options |= optval; 1547 THIS->set_option (optval, set);
1600 else
1601 THIS->options &= ~optval;
1602 1548
1603 if (THIS->check_ev.is_active ()) // avoid doing this before START 1549 if (THIS->init_done) // avoid doing this before START
1604 switch (optval) 1550 switch (optval)
1605 { 1551 {
1606 case Opt_skipBuiltinGlyphs: 1552 case Opt_skipBuiltinGlyphs:
1607 THIS->set_fonts (); 1553 THIS->set_fonts ();
1608 THIS->scr_remap_chars (); 1554 THIS->scr_remap_chars ();
1609 THIS->scr_touch (true); 1555 THIS->scr_touch (true);
1610 THIS->want_refresh = 1; 1556 THIS->want_refresh = 1;
1557 THIS->refresh_check ();
1611 break; 1558 break;
1612 1559
1613 case Opt_cursorUnderline: 1560 case Opt_cursorUnderline:
1614 THIS->want_refresh = 1; 1561 THIS->want_refresh = 1;
1562 THIS->refresh_check ();
1615 break; 1563 break;
1616 1564
1617# case Opt_scrollBar_floating: 1565# case Opt_scrollBar_floating:
1618# case Opt_scrollBar_right: 1566# case Opt_scrollBar_right:
1619# THIS->resize_all_windows (THIS->width, THIS->height, 1); 1567# THIS->resize_all_windows (THIS->width, THIS->height, 1);
… …
1629 CODE: 1577 CODE:
1630 RETVAL = 0 < THIS->parse_keysym (keysym, str); 1578 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1631 THIS->keyboard->register_done (); 1579 THIS->keyboard->register_done ();
1632 OUTPUT: 1580 OUTPUT:
1633 RETVAL 1581 RETVAL
1582
1583void
1584rxvt_term::register_command (int keysym, unsigned int state, SV *str)
1585 CODE:
1586 wchar_t *wstr = sv2wcs (str);
1587 THIS->keyboard->register_user_translation (keysym, state, wstr);
1588 free (wstr);
1634 1589
1635void 1590void
1636rxvt_term::screen_cur (...) 1591rxvt_term::screen_cur (...)
1637 PROTOTYPE: $;$$ 1592 PROTOTYPE: $;$$
1638 ALIAS: 1593 ALIAS:
… …
1652 EXTEND (SP, 2); 1607 EXTEND (SP, 2);
1653 PUSHs (sv_2mortal (newSViv (rc.row))); 1608 PUSHs (sv_2mortal (newSViv (rc.row)));
1654 PUSHs (sv_2mortal (newSViv (rc.col))); 1609 PUSHs (sv_2mortal (newSViv (rc.col)));
1655 } 1610 }
1656 1611
1657 if (items == 3) 1612 if (items >= 3)
1658 { 1613 {
1659 rc.row = SvIV (ST (1)); 1614 rc.row = SvIV (ST (1));
1660 rc.col = SvIV (ST (2)); 1615 rc.col = SvIV (ST (2));
1661 1616
1662 if (ix == 2) 1617 if (ix == 2)
… …
1677 1632
1678 clamp_it (rc.col, 0, THIS->ncol); 1633 clamp_it (rc.col, 0, THIS->ncol);
1679 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1); 1634 clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
1680 1635
1681 if (ix) 1636 if (ix)
1637 {
1638 THIS->selection.screen = THIS->current_screen;
1639
1682 THIS->want_refresh = 1; 1640 THIS->want_refresh = 1;
1641 THIS->refresh_check ();
1683 } 1642 }
1643 }
1684} 1644}
1685 1645
1686char 1646int
1687rxvt_term::cur_charset () 1647rxvt_term::selection_screen (int screen = -1)
1688 CODE: 1648 CODE:
1689 RETVAL = THIS->charsets [THIS->screen.charset]; 1649 RETVAL = THIS->selection.screen;
1690 OUTPUT: 1650 if (screen >= 0)
1651 THIS->selection.screen = screen;
1652 OUTPUT:
1691 RETVAL 1653 RETVAL
1692 1654
1693void 1655void
1694rxvt_term::selection_clear () 1656rxvt_term::selection_clear (bool clipboard = false)
1695 1657
1696void 1658void
1697rxvt_term::selection_make (Time eventtime, bool rect = false) 1659rxvt_term::selection_make (Time eventtime, bool rect = false)
1698 CODE: 1660 CODE:
1699 THIS->selection.op = SELECTION_CONT; 1661 THIS->selection.op = SELECTION_CONT;
1700 THIS->selection.rect = rect; 1662 THIS->selection.rect = rect;
1701 THIS->selection_make (eventtime); 1663 THIS->selection_make (eventtime);
1702 1664
1703int 1665int
1704rxvt_term::selection_grab (Time eventtime) 1666rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
1705 1667
1706void 1668void
1707rxvt_term::selection (SV *newtext = 0) 1669rxvt_term::selection (SV *newtext = 0, bool clipboard = false)
1708 PPCODE: 1670 PPCODE:
1709{ 1671{
1672 wchar_t * &text = clipboard ? THIS->selection.clip_text : THIS->selection.text;
1673 unsigned int &len = clipboard ? THIS->selection.clip_len : THIS->selection.len;
1674
1710 if (GIMME_V != G_VOID) 1675 if (GIMME_V != G_VOID)
1711 XPUSHs (THIS->selection.text 1676 XPUSHs (text
1712 ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)) 1677 ? sv_2mortal (wcs2sv (text, len))
1713 : &PL_sv_undef); 1678 : &PL_sv_undef);
1714 1679
1715 if (newtext) 1680 if (newtext)
1716 { 1681 {
1717 free (THIS->selection.text); 1682 free (text);
1718 1683
1719 THIS->selection.text = sv2wcs (newtext); 1684 text = sv2wcs (newtext);
1720 THIS->selection.len = wcslen (THIS->selection.text); 1685 len = wcslen (text);
1721 } 1686 }
1722} 1687}
1688
1689char
1690rxvt_term::cur_charset ()
1691 CODE:
1692 RETVAL = THIS->charsets [THIS->screen.charset];
1693 OUTPUT:
1694 RETVAL
1723 1695
1724void 1696void
1725rxvt_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) 1697rxvt_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)
1726 1698
1727void 1699void
… …
1749 char *str = SvPVbyte (octets, len); 1721 char *str = SvPVbyte (octets, len);
1750 C_ARGS: 1722 C_ARGS:
1751 str, len 1723 str, len
1752 1724
1753void 1725void
1726rxvt_term::tt_paste (SV *octets)
1727 INIT:
1728 STRLEN len;
1729 char *str = SvPVbyte (octets, len);
1730 C_ARGS:
1731 str, len
1732
1733void
1754rxvt_term::cmd_parse (SV *octets) 1734rxvt_term::cmd_parse (SV *octets)
1755 CODE: 1735 CODE:
1756{ 1736{
1757 STRLEN len; 1737 STRLEN len;
1758 char *str = SvPVbyte (octets, len); 1738 char *str = SvPVbyte (octets, len);
… …
1794 Atom *props = XListProperties (THIS->dpy, window, &count); 1774 Atom *props = XListProperties (THIS->dpy, window, &count);
1795 1775
1796 EXTEND (SP, count); 1776 EXTEND (SP, count);
1797 while (count--) 1777 while (count--)
1798 PUSHs (newSVuv ((U32)props [count])); 1778 PUSHs (newSVuv ((U32)props [count]));
1799 1779
1800 XFree (props); 1780 XFree (props);
1801} 1781}
1802 1782
1803void 1783void
1804rxvt_term::XGetWindowProperty (Window window, Atom property) 1784rxvt_term::XGetWindowProperty (Window window, Atom property)
… …
1827 XFree (prop); 1807 XFree (prop);
1828 } 1808 }
1829} 1809}
1830 1810
1831void 1811void
1832rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data) 1812rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
1833 CODE: 1813 CODE:
1834{ 1814{
1835 STRLEN len; 1815 STRLEN len;
1836 char *data_ = SvPVbyte (data, len); 1816 char *data_ = SvPVbyte (data, len);
1837 1817
… …
1933overlay::hide () 1913overlay::hide ()
1934 1914
1935void 1915void
1936overlay::DESTROY () 1916overlay::DESTROY ()
1937 1917
1938############################################################################# 1918INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
1939# urxvt::watcher
1940#############################################################################
1941 1919
1942MODULE = urxvt PACKAGE = urxvt::watcher
1943
1944CHAINED
1945perl_watcher::cb (SV *cb)
1946 CODE:
1947 THIS->cb (cb);
1948 OUTPUT:
1949 RETVAL
1950
1951#############################################################################
1952# urxvt::timer
1953#############################################################################
1954
1955MODULE = urxvt PACKAGE = urxvt::timer
1956
1957SV *
1958timer::new ()
1959 CODE:
1960 timer *w = new timer;
1961 w->start (NOW);
1962 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
1963 w->self = (HV *)SvRV (RETVAL);
1964 OUTPUT:
1965 RETVAL
1966
1967NV
1968timer::at ()
1969 CODE:
1970 RETVAL = THIS->at;
1971 OUTPUT:
1972 RETVAL
1973
1974CHAINED
1975timer::interval (NV interval)
1976 CODE:
1977 THIS->interval = interval;
1978 OUTPUT:
1979 RETVAL
1980
1981CHAINED
1982timer::set (NV tstamp)
1983 CODE:
1984 THIS->set (tstamp);
1985 OUTPUT:
1986 RETVAL
1987
1988CHAINED
1989timer::start (NV tstamp = THIS->at)
1990 CODE:
1991 THIS->start (tstamp);
1992 OUTPUT:
1993 RETVAL
1994
1995CHAINED
1996timer::after (NV delay)
1997 CODE:
1998 THIS->start (NOW + delay);
1999 OUTPUT:
2000 RETVAL
2001
2002CHAINED
2003timer::stop ()
2004 CODE:
2005 THIS->stop ();
2006 OUTPUT:
2007 RETVAL
2008
2009void
2010timer::DESTROY ()
2011
2012#############################################################################
2013# urxvt::iow
2014#############################################################################
2015
2016MODULE = urxvt PACKAGE = urxvt::iow
2017
2018SV *
2019iow::new ()
2020 CODE:
2021 iow *w = new iow;
2022 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
2023 w->self = (HV *)SvRV (RETVAL);
2024 OUTPUT:
2025 RETVAL
2026
2027CHAINED
2028iow::fd (int fd)
2029 CODE:
2030 THIS->fd = fd;
2031 OUTPUT:
2032 RETVAL
2033
2034CHAINED
2035iow::events (short events)
2036 CODE:
2037 THIS->events = events;
2038 OUTPUT:
2039 RETVAL
2040
2041CHAINED
2042iow::start ()
2043 CODE:
2044 THIS->start ();
2045 OUTPUT:
2046 RETVAL
2047
2048CHAINED
2049iow::stop ()
2050 CODE:
2051 THIS->stop ();
2052 OUTPUT:
2053 RETVAL
2054
2055void
2056iow::DESTROY ()
2057
2058#############################################################################
2059# urxvt::iw
2060#############################################################################
2061
2062MODULE = urxvt PACKAGE = urxvt::iw
2063
2064SV *
2065iw::new ()
2066 CODE:
2067 iw *w = new iw;
2068 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
2069 w->self = (HV *)SvRV (RETVAL);
2070 OUTPUT:
2071 RETVAL
2072
2073CHAINED
2074iw::start ()
2075 CODE:
2076 THIS->start ();
2077 OUTPUT:
2078 RETVAL
2079
2080CHAINED
2081iw::stop ()
2082 CODE:
2083 THIS->stop ();
2084 OUTPUT:
2085 RETVAL
2086
2087void
2088iw::DESTROY ()
2089
2090#############################################################################
2091# urxvt::pw
2092#############################################################################
2093
2094MODULE = urxvt PACKAGE = urxvt::pw
2095
2096SV *
2097pw::new ()
2098 CODE:
2099 pw *w = new pw;
2100 RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
2101 w->self = (HV *)SvRV (RETVAL);
2102 OUTPUT:
2103 RETVAL
2104
2105CHAINED
2106pw::start (int pid)
2107 CODE:
2108 THIS->start (pid);
2109 OUTPUT:
2110 RETVAL
2111
2112CHAINED
2113pw::stop ()
2114 CODE:
2115 THIS->stop ();
2116 OUTPUT:
2117 RETVAL
2118
2119void
2120pw::DESTROY ()
2121
2122

Diff Legend

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