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.13 by root, Tue Jan 3 04:18:47 2006 UTC vs.
Revision 1.56 by root, Thu Jan 12 00:35:39 2006 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-2005 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
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.
26#include <XSUB.h> 26#include <XSUB.h>
27#undef line_t 27#undef line_t
28 28
29#include "../config.h" 29#include "../config.h"
30 30
31#include <cstddef>
31#include <cstdarg> 32#include <cstdarg>
32 33
34#include "iom.h"
33#include "rxvt.h" 35#include "rxvt.h"
34#include "iom.h" 36#include "keyboard.h"
35#include "rxvtutil.h" 37#include "rxvtutil.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include "perlxsi.c" 40#include "perlxsi.c"
41
42#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
43# define GRAB_CURSOR THIS->leftptr_cursor
44#else
45# define GRAB_CURSOR None
46#endif
39 47
40#undef LINENO 48#undef LINENO
41#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 49#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
42#undef ROW 50#undef ROW
43#define ROW(n) THIS->row_buf [LINENO (n)] 51#define ROW(n) THIS->row_buf [LINENO (n)]
44 52
45///////////////////////////////////////////////////////////////////////////// 53/////////////////////////////////////////////////////////////////////////////
46 54
55static SV *
56taint (SV *sv)
57{
58 SvTAINT (sv);
59 return sv;
60}
61
62static SV *
63taint_if (SV *sv, SV *src)
64{
65 if (SvTAINTED (src))
66 SvTAINT (sv);
67
68 return sv;
69}
70
47static wchar_t * 71static wchar_t *
48sv2wcs (SV *sv) 72sv2wcs (SV *sv)
49{ 73{
50 STRLEN len; 74 STRLEN len;
51 char *str = SvPVutf8 (sv, len); 75 char *str = SvPVutf8 (sv, len);
52 return rxvt_utf8towcs (str, len); 76 return rxvt_utf8towcs (str, len);
53} 77}
54 78
55static SV * 79static SV *
80wcs2sv (wchar_t *wstr, int len = -1)
81{
82 char *str = rxvt_wcstoutf8 (wstr, len);
83
84 SV *sv = newSVpv (str, 0);
85 SvUTF8_on (sv);
86 free (str);
87
88 return sv;
89}
90
91static SV *
56new_ref (HV *hv, const char *klass) 92new_ref (HV *hv, const char *klass)
57{ 93{
58 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1)); 94 return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
59} 95}
60 96
61//TODO: use magic 97//TODO: use magic
62static SV * 98static SV *
63newSVptr (void *ptr, const char *klass) 99newSVptr (void *ptr, const char *klass)
64{ 100{
65 HV *hv = newHV (); 101 HV *hv = newHV ();
66 hv_store (hv, "_ptr", 4, newSViv ((long)ptr), 0); 102 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
67 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 103 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
104}
105
106static void
107clearSVptr (SV *sv)
108{
109 if (SvROK (sv))
110 sv = SvRV (sv);
111
112 hv_clear ((HV *)sv);
113 sv_unmagic (sv, PERL_MAGIC_ext);
68} 114}
69 115
70static long 116static long
71SvPTR (SV *sv, const char *klass) 117SvPTR (SV *sv, const char *klass)
72{ 118{
73 if (!sv_derived_from (sv, klass)) 119 if (!sv_derived_from (sv, klass))
74 croak ("object of type %s expected", klass); 120 croak ("object of type %s expected", klass);
75 121
76 IV iv = SvIV (*hv_fetch ((HV *)SvRV (sv), "_ptr", 4, 1)); 122 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
77 123
78 if (!iv) 124 if (!mg)
79 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 125 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
80 126
81 return (long)iv; 127 return (long)mg->mg_ptr;
82} 128}
83 129
84#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 130#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
85#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 131#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
86 132
87///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
88 134
89struct perl_watcher 135struct perl_watcher
186 rend_t **rend; 232 rend_t **rend;
187 233
188 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 234 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
189 ~overlay (); 235 ~overlay ();
190 236
237 void show ();
238 void hide ();
239
191 void swap (); 240 void swap ();
192 241
193 void set (int x, int y, SV *str, SV *rend); 242 void set (int x, int y, SV *str, SV *rend);
194}; 243};
195 244
202 h += 2; 251 h += 2;
203 } 252 }
204 253
205 text = new text_t *[h]; 254 text = new text_t *[h];
206 rend = new rend_t *[h]; 255 rend = new rend_t *[h];
207 256
208 for (int y = 0; y < h; y++) 257 for (int y = 0; y < h; y++)
209 { 258 {
210 text_t *tp = text[y] = new text_t[w]; 259 text_t *tp = text[y] = new text_t[w];
211 rend_t *rp = rend[y] = new rend_t[w]; 260 rend_t *rp = rend[y] = new rend_t[w];
212 261
213 text_t t0, t1, t2; 262 text_t t0, t1, t2;
214 rend_t r = rstyle; 263 rend_t r = rstyle;
215 264
216 if (border == 2) 265 if (border == 2)
217 { 266 {
218 if (y == 0) 267 if (y == 0)
219 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 268 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
220 else if (y < h - 1) 269 else if (y < h - 1)
221 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 270 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
222 else 271 else
223 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; 272 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
224 273
225 *tp++ = t0; 274 *tp++ = t0;
226 *rp++ = r; 275 *rp++ = r;
227 276
228 for (int x = w - 2; x-- > 0; ) 277 for (int x = w - 2; x-- > 0; )
229 { 278 {
230 *tp++ = t1; 279 *tp++ = t1;
231 *rp++ = r; 280 *rp++ = r;
232 } 281 }
233 282
234 *tp = t2; 283 *tp = t2;
235 *rp = r; 284 *rp = r;
236 } 285 }
237 else 286 else
238 for (int x = w; x-- > 0; ) 287 for (int x = w; x-- > 0; )
239 { 288 {
240 *tp++ = 0x0020; 289 *tp++ = 0x0020;
241 *rp++ = r; 290 *rp++ = r;
242 } 291 }
243 } 292 }
244 293
294 show ();
245 THIS->want_refresh = 1; 295 THIS->want_refresh = 1;
246} 296}
247 297
248overlay::~overlay () 298overlay::~overlay ()
249{ 299{
300 hide ();
301
250 for (int y = h; y--; ) 302 for (int y = h; y--; )
251 { 303 {
252 delete [] text[y]; 304 delete [] text[y];
253 delete [] rend[y]; 305 delete [] rend[y];
254 } 306 }
257 delete [] rend; 309 delete [] rend;
258 310
259 THIS->want_refresh = 1; 311 THIS->want_refresh = 1;
260} 312}
261 313
314void
315overlay::show ()
316{
317 char key[33]; sprintf (key, "%32lx", (long)this);
318
319 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
320 hv_store (hv, key, 32, newSViv ((long)this), 0);
321}
322
323void
324overlay::hide ()
325{
326 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0);
327
328 if (ovs)
329 {
330 char key[33]; sprintf (key, "%32lx", (long)this);
331
332 HV *hv = (HV *)SvRV (*ovs);
333 hv_delete (hv, key, 32, G_DISCARD);
334 }
335}
336
262void overlay::swap () 337void overlay::swap ()
263{ 338{
264 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 339 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
265 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 340 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
266 341
269 344
270 for (int y = ov_h; y--; ) 345 for (int y = ov_h; y--; )
271 { 346 {
272 text_t *t1 = text [y]; 347 text_t *t1 = text [y];
273 rend_t *r1 = rend [y]; 348 rend_t *r1 = rend [y];
274 349
275 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x; 350 text_t *t2 = ROW(y + ov_y - THIS->view_start).t + ov_x;
276 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x; 351 rend_t *r2 = ROW(y + ov_y - THIS->view_start).r + ov_x;
277 352
278 for (int x = ov_w; x--; ) 353 for (int x = ov_w; x--; )
279 { 354 {
280 text_t t = *t1; *t1++ = *t2; *t2++ = t; 355 text_t t = *t1; *t1++ = *t2; *t2++ = t;
281 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t)); 356 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (t));
282 } 357 }
283 } 358 }
284 359
285} 360}
286 361
287void overlay::set (int x, int y, SV *str, SV *rend) 362void overlay::set (int x, int y, SV *text, SV *rend)
288{ 363{
289 x += border; 364 x += border;
290 y += border; 365 y += border;
291 366
292 if (!IN_RANGE_EXC (y, 0, h - border)) 367 if (!IN_RANGE_EXC (y, 0, h - border))
293 return; 368 return;
294 369
295 wchar_t *wstr = sv2wcs (str); 370 wchar_t *wtext = sv2wcs (text);
296 371
297 for (int col = min (wcslen (wstr), w - x - border); col--; ) 372 for (int col = min (wcslen (wtext), w - x - border); col--; )
298 text [y][x + col] = wstr [col]; 373 this->text [y][x + col] = wtext [col];
299 374
300 free (wstr); 375 free (wtext);
376
377 if (rend)
378 {
379 if (!SvROK (rend) || SvTYPE (SvRV (rend)) != SVt_PVAV)
380 croak ("rend must be arrayref");
381
382 AV *av = (AV *)SvRV (rend);
383
384 for (int col = min (av_len (av) + 1, w - x - border); col--; )
385 this->rend [y][x + col] = SvIV (*av_fetch (av, col, 1));
386 }
301 387
302 THIS->want_refresh = 1; 388 THIS->want_refresh = 1;
303} 389}
304 390
305 391
325void 411void
326rxvt_perl_interp::init () 412rxvt_perl_interp::init ()
327{ 413{
328 if (!perl) 414 if (!perl)
329 { 415 {
416 temp_environ temp_environ(rxvt_environ);
417
330 char *argv[] = { 418 char *argv[] = {
331 "", 419 "",
420 "-T",
332 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 421 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
333 }; 422 };
334 423
335 perl = perl_alloc (); 424 perl = perl_alloc ();
336 perl_construct (perl); 425 perl_construct (perl);
337 426
338 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 427 if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
339 || perl_run (perl)) 428 || perl_run (perl))
340 { 429 {
341 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 430 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
342 431
343 perl_destruct (perl); 432 perl_destruct (perl);
345 perl = 0; 434 perl = 0;
346 } 435 }
347 } 436 }
348} 437}
349 438
439static void
440ungrab (rxvt_term *THIS)
441{
442 if (THIS->perl.grabtime)
443 {
444 XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
445 XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
446 THIS->perl.grabtime = 0;
447 }
448}
449
350bool 450bool
351rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...) 451rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
352{ 452{
353 if (!perl) 453 if (!perl)
354 return false; 454 return false;
355 455
356 if (htype == HOOK_INIT) // first hook ever called 456 if (htype == HOOK_INIT) // first hook ever called
357 { 457 {
358 term->self = (void *)newSVptr ((void *)term, "urxvt::term"); 458 term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
359 hv_store ((HV *)SvRV ((SV *)term->self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0); 459 hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
360 } 460 }
461 else if (!term->perl.self)
462 return false; // perl not initialized for this instance
361 else if (htype == HOOK_DESTROY) 463 else if (htype == HOOK_DESTROY)
362 { 464 {
363 // handled later 465 // handled later
364 } 466 }
365 else if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END) 467 else
366 { 468 {
367 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->self), "_overlay", 8, 0)); 469 if (htype == HOOK_REFRESH_BEGIN || htype == HOOK_REFRESH_END)
368
369 if (HvKEYS (hv))
370 { 470 {
471 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
472
473 if (HvKEYS (hv))
474 {
371 hv_iterinit (hv); 475 hv_iterinit (hv);
372 476
373 while (HE *he = hv_iternext (hv)) 477 while (HE *he = hv_iternext (hv))
374 ((overlay *)SvIV (hv_iterval (hv, he)))->swap (); 478 ((overlay *)SvIV (hv_iterval (hv, he)))->swap ();
479 }
480
375 } 481 }
482
483 if (!should_invoke [htype])
484 return false;
376 } 485 }
377 else if (!should_invoke [htype]) 486
378 return false; 487 temp_environ temp_environ(rxvt_environ);
379 488
380 dSP; 489 dSP;
381 va_list ap; 490 va_list ap;
382 491
383 va_start (ap, htype); 492 va_start (ap, htype);
401 510
402 case DT_LONG: 511 case DT_LONG:
403 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 512 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
404 break; 513 break;
405 514
406 case DT_STRING: 515 case DT_STR:
407 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 516 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
517 break;
518
519 case DT_STR_LEN:
520 {
521 char *str = va_arg (ap, char *);
522 int len = va_arg (ap, int);
523
524 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
525 }
526 break;
527
528 case DT_WCS_LEN:
529 {
530 wchar_t *wstr = va_arg (ap, wchar_t *);
531 int wlen = va_arg (ap, int);
532
533 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
534 }
535 break;
536
537 case DT_XEVENT:
538 {
539 XEvent *xe = va_arg (ap, XEvent *);
540 HV *hv = newHV ();
541
542# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
543# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
544# undef set
545
546 setiv (type, xe->type);
547 setiv (send_event, xe->xany.send_event);
548 setiv (serial, xe->xany.serial);
549
550 switch (xe->type)
551 {
552 case KeyPress:
553 case KeyRelease:
554 case ButtonPress:
555 case ButtonRelease:
556 case MotionNotify:
557 setiv (time, xe->xmotion.time);
558 setiv (x, xe->xmotion.x);
559 setiv (y, xe->xmotion.y);
560 setiv (row, xe->xmotion.y / term->fheight);
561 setiv (col, xe->xmotion.x / term->fwidth);
562 setiv (x_root, xe->xmotion.x_root);
563 setiv (y_root, xe->xmotion.y_root);
564 setiv (state, xe->xmotion.state);
565 break;
566 }
567
568 switch (xe->type)
569 {
570 case KeyPress:
571 case KeyRelease:
572 setiv (keycode, xe->xkey.keycode);
573 break;
574
575 case ButtonPress:
576 case ButtonRelease:
577 setiv (button, xe->xbutton.button);
578 break;
579
580 case MotionNotify:
581 setiv (is_hint, xe->xmotion.is_hint);
582 break;
583 }
584
585 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
586 }
408 break; 587 break;
409 588
410 case DT_END: 589 case DT_END:
411 { 590 {
412 va_end (ap); 591 va_end (ap);
424 PUTBACK; 603 PUTBACK;
425 FREETMPS; 604 FREETMPS;
426 LEAVE; 605 LEAVE;
427 606
428 if (SvTRUE (ERRSV)) 607 if (SvTRUE (ERRSV))
608 {
429 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 609 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
610 ungrab (term); // better lose the grab than the session
611 }
430 612
431 if (htype == HOOK_DESTROY) 613 if (htype == HOOK_DESTROY)
432 { 614 {
433 // TODO: clear magic
434 hv_clear ((HV *)SvRV ((SV *)term->self)); 615 clearSVptr ((SV *)term->perl.self);
435 SvREFCNT_dec ((SV *)term->self); 616 SvREFCNT_dec ((SV *)term->perl.self);
436 } 617 }
437 618
438 return count; 619 return count;
439 } 620 }
440 621
450 631
451PROTOTYPES: ENABLE 632PROTOTYPES: ENABLE
452 633
453BOOT: 634BOOT:
454{ 635{
455# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0)) 636 sv_setsv (get_sv ("urxvt::LIBDIR", 1), newSVpvn (LIBDIR, sizeof (LIBDIR) - 1));
456# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name)); 637 sv_setsv (get_sv ("urxvt::RESNAME", 1), newSVpvn (RESNAME, sizeof (RESNAME) - 1));
638 sv_setsv (get_sv ("urxvt::RESCLASS", 1), newSVpvn (RESCLASS, sizeof (RESCLASS) - 1));
639 sv_setsv (get_sv ("urxvt::RXVTNAME", 1), newSVpvn (RXVTNAME, sizeof (RXVTNAME) - 1));
640
457 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 641 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
458 set_hookname (INIT); 642# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
459 set_hookname (RESET); 643# include "hookinc.h"
460 set_hookname (START); 644# undef def
461 set_hookname (DESTROY);
462 set_hookname (SEL_BEGIN);
463 set_hookname (SEL_EXTEND);
464 set_hookname (SEL_MAKE);
465 set_hookname (SEL_GRAB);
466 set_hookname (FOCUS_IN);
467 set_hookname (FOCUS_OUT);
468 set_hookname (VIEW_CHANGE);
469 set_hookname (SCROLL_BACK);
470 set_hookname (TTY_ACTIVITY);
471 set_hookname (REFRESH_BEGIN);
472 set_hookname (REFRESH_END);
473 set_hookname (KEYBOARD_COMMAND);
474 645
646 HV *option = get_hv ("urxvt::OPTION", 1);
647# define def(name,val) hv_store (option, # name, sizeof (# name) - 1, newSVuv (Opt_ ## name), 0);
648# define nodef(name)
649# include "optinc.h"
650# undef nodef
651# undef def
652
653 HV *stash = gv_stashpv ("urxvt", 1);
654# define export_const_iv(name) newCONSTSUB (stash, # name, newSViv (name));
475 export_const (DEFAULT_RSTYLE); 655 export_const_iv (DEFAULT_RSTYLE);
476 export_const (OVERLAY_RSTYLE); 656 export_const_iv (OVERLAY_RSTYLE);
477 export_const (RS_Bold); 657 export_const_iv (RS_Bold);
478 export_const (RS_Italic); 658 export_const_iv (RS_Italic);
479 export_const (RS_Blink); 659 export_const_iv (RS_Blink);
480 export_const (RS_RVid); 660 export_const_iv (RS_RVid);
481 export_const (RS_Uline); 661 export_const_iv (RS_Uline);
482 662
483 sv_setpv (get_sv ("urxvt::LIBDIR", 1), LIBDIR); 663 export_const_iv (CurrentTime);
664 export_const_iv (ShiftMask);
665 export_const_iv (LockMask);
666 export_const_iv (ControlMask);
667 export_const_iv (Mod1Mask);
668 export_const_iv (Mod2Mask);
669 export_const_iv (Mod3Mask);
670 export_const_iv (Mod4Mask);
671 export_const_iv (Mod5Mask);
672 export_const_iv (Button1Mask);
673 export_const_iv (Button2Mask);
674 export_const_iv (Button3Mask);
675 export_const_iv (Button4Mask);
676 export_const_iv (Button5Mask);
677 export_const_iv (AnyModifier);
678
679 export_const_iv (EVENT_NONE);
680 export_const_iv (EVENT_READ);
681 export_const_iv (EVENT_WRITE);
484} 682}
485 683
486void 684void
487set_should_invoke (int htype, int value) 685set_should_invoke (int htype, int value)
488 CODE: 686 CODE:
495 693
496void 694void
497fatal (const char *msg) 695fatal (const char *msg)
498 CODE: 696 CODE:
499 rxvt_fatal ("%s", msg); 697 rxvt_fatal ("%s", msg);
698
699SV *
700untaint (SV *sv)
701 CODE:
702 RETVAL = newSVsv (sv);
703 SvTAINTED_off (RETVAL);
704 OUTPUT:
705 RETVAL
706
707bool
708safe ()
709 CODE:
710 RETVAL = !rxvt_tainted ();
711 OUTPUT:
712 RETVAL
500 713
501NV 714NV
502NOW () 715NOW ()
503 CODE: 716 CODE:
504 RETVAL = NOW; 717 RETVAL = NOW;
552} 765}
553 OUTPUT: 766 OUTPUT:
554 RETVAL 767 RETVAL
555 768
556MODULE = urxvt PACKAGE = urxvt::term 769MODULE = urxvt PACKAGE = urxvt::term
770
771SV *
772_new (...)
773 CODE:
774{
775 if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
776 croak ("first argument to urxvt::term->_new must be arrayref");
777
778 rxvt_term *term = new rxvt_term;
779
780 term->argv = new stringvec;
781 term->envv = new stringvec;
782
783 for (int i = 1; i < items; i++)
784 term->argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
785
786 AV *envv = (AV *)SvRV (ST (0));
787 for (int i = av_len (envv) + 1; i--; )
788 term->envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (envv, i, 1))));
789
790 term->envv->push_back (0);
791
792 bool success;
793
794 try
795 {
796 success = term->init (term->argv->size (), term->argv->begin ());
797 }
798 catch (const class rxvt_failure_exception &e)
799 {
800 success = false;
801 }
802
803 if (!success)
804 {
805 term->destroy ();
806 croak ("error while initializing new terminal instance");
807 }
808
809 RETVAL = term && term->perl.self
810 ? newSVterm (term) : &PL_sv_undef;
811}
812 OUTPUT:
813 RETVAL
814
815void
816rxvt_term::destroy ()
817
818void
819rxvt_term::grab_button (int button, U32 modifiers)
820 CODE:
821 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
822 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
823 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
824
825bool
826rxvt_term::grab (U32 eventtime, int sync = 0)
827 CODE:
828{
829 int mode = sync ? GrabModeSync : GrabModeAsync;
830
831 THIS->perl.grabtime = 0;
832
833 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
834 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
835 mode, mode, None, GRAB_CURSOR, eventtime))
836 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
837 THIS->perl.grabtime = eventtime;
838 else
839 XUngrabPointer (THIS->display->display, eventtime);
840
841 RETVAL = !!THIS->perl.grabtime;
842}
843 OUTPUT:
844 RETVAL
845
846void
847rxvt_term::allow_events_async ()
848 CODE:
849 XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
850
851void
852rxvt_term::allow_events_sync ()
853 CODE:
854 XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
855
856void
857rxvt_term::allow_events_replay ()
858 CODE:
859 XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
860 XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
861
862void
863rxvt_term::ungrab ()
864 CODE:
865 ungrab (THIS);
557 866
558int 867int
559rxvt_term::strwidth (SV *str) 868rxvt_term::strwidth (SV *str)
560 CODE: 869 CODE:
561{ 870{
580 char *mbstr = rxvt_wcstombs (wstr); 889 char *mbstr = rxvt_wcstombs (wstr);
581 rxvt_pop_locale (); 890 rxvt_pop_locale ();
582 891
583 free (wstr); 892 free (wstr);
584 893
585 RETVAL = newSVpv (mbstr, 0); 894 RETVAL = taint_if (newSVpv (mbstr, 0), str);
586 free (mbstr); 895 free (mbstr);
587} 896}
588 OUTPUT: 897 OUTPUT:
589 RETVAL 898 RETVAL
590 899
597 906
598 rxvt_push_locale (THIS->locale); 907 rxvt_push_locale (THIS->locale);
599 wchar_t *wstr = rxvt_mbstowcs (data, len); 908 wchar_t *wstr = rxvt_mbstowcs (data, len);
600 rxvt_pop_locale (); 909 rxvt_pop_locale ();
601 910
602 char *str = rxvt_wcstoutf8 (wstr); 911 RETVAL = taint_if (wcs2sv (wstr), octets);
603 free (wstr); 912 free (wstr);
604
605 RETVAL = newSVpv (str, 0);
606 SvUTF8_on (RETVAL);
607 free (str);
608} 913}
609 OUTPUT: 914 OUTPUT:
610 RETVAL 915 RETVAL
916
917#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
918
919#define TERM_OFFSET_width TERM_OFFSET(width)
920#define TERM_OFFSET_height TERM_OFFSET(height)
921#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
922#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
923#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
924#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
925#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
926#define TERM_OFFSET_focus TERM_OFFSET(focus)
927#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
928#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
929#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
930#define TERM_OFFSET_nsaved TERM_OFFSET(nsaved)
611 931
612int 932int
933rxvt_term::width ()
934 ALIAS:
935 width = TERM_OFFSET_width
936 height = TERM_OFFSET_height
937 fwidth = TERM_OFFSET_fwidth
938 fheight = TERM_OFFSET_fheight
939 fbase = TERM_OFFSET_fbase
940 nrow = TERM_OFFSET_nrow
941 ncol = TERM_OFFSET_ncol
942 focus = TERM_OFFSET_focus
943 mapped = TERM_OFFSET_mapped
944 saveLines = TERM_OFFSET_saveLines
945 total_rows = TERM_OFFSET_total_rows
946 nsaved = TERM_OFFSET_nsaved
947 CODE:
948 RETVAL = *(int *)((char *)THIS + ix);
949 OUTPUT:
950 RETVAL
951
952unsigned int
953rxvt_term::ModLevel3Mask ()
954 ALIAS:
955 ModLevel3Mask = 0
956 ModMetaMask = 1
957 ModNumLockMask = 2
958 CODE:
959 switch (ix)
960 {
961 case 0: RETVAL = THIS->ModLevel3Mask; break;
962 case 1: RETVAL = THIS->ModMetaMask; break;
963 case 2: RETVAL = THIS->ModNumLockMask; break;
964 }
965 OUTPUT:
966 RETVAL
967
968char *
969rxvt_term::display_id ()
970 ALIAS:
971 display_id = 0
972 locale = 1
973 CODE:
974 switch (ix)
975 {
976 case 0: RETVAL = THIS->display->id; break;
977 case 1: RETVAL = THIS->locale; break;
978 }
979 OUTPUT:
980 RETVAL
981
982SV *
613rxvt_term::nsaved () 983rxvt_term::_env ()
614 CODE: 984 CODE:
985{
986 if (THIS->envv)
987 {
988 AV *av = newAV ();
989
990 for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
991 if (*i)
992 av_push (av, newSVpv (*i, 0));
993
994 RETVAL = newRV_noinc ((SV *)av);
995 }
996 else
997 RETVAL = &PL_sv_undef;
998}
999 OUTPUT:
1000 RETVAL
1001
1002int
1003rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
1004 CODE:
1005 RETVAL = THIS->pty_ev.events;
1006 if (events != EVENT_UNDEF)
1007 THIS->pty_ev.set (events);
1008 OUTPUT:
1009 RETVAL
1010
1011U32
1012rxvt_term::parent ()
1013 CODE:
1014 RETVAL = (U32)THIS->parent [0];
1015 OUTPUT:
1016 RETVAL
1017
1018U32
1019rxvt_term::vt ()
1020 CODE:
1021 RETVAL = (U32)THIS->vt;
1022 OUTPUT:
1023 RETVAL
1024
1025U32
1026rxvt_term::rstyle (U32 new_rstyle = THIS->rstyle)
1027 CODE:
1028{
615 RETVAL = THIS->nsaved; 1029 RETVAL = THIS->rstyle;
1030 THIS->rstyle = new_rstyle;
1031}
616 OUTPUT: 1032 OUTPUT:
617 RETVAL 1033 RETVAL
618 1034
619int 1035int
620rxvt_term::view_start (int newval = -1) 1036rxvt_term::view_start (int newval = -1)
621 CODE: 1037 CODE:
622{ 1038{
629 } 1045 }
630} 1046}
631 OUTPUT: 1047 OUTPUT:
632 RETVAL 1048 RETVAL
633 1049
634int
635rxvt_term::nrow ()
636 CODE:
637 RETVAL = THIS->nrow;
638 OUTPUT:
639 RETVAL
640
641int
642rxvt_term::ncol ()
643 CODE:
644 RETVAL = THIS->ncol;
645 OUTPUT:
646 RETVAL
647
648void 1050void
649rxvt_term::want_refresh () 1051rxvt_term::want_refresh ()
650 CODE: 1052 CODE:
651 THIS->want_refresh = 1; 1053 THIS->want_refresh = 1;
652 1054
653void 1055void
654rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 1056rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
655 PPCODE: 1057 PPCODE:
656{ 1058{
657 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1059 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
658 croak ("row_number number of out range"); 1060 XSRETURN_EMPTY;
659 1061
660 line_t &l = ROW(row_number); 1062 line_t &l = ROW(row_number);
661 1063
662 if (GIMME_V != G_VOID) 1064 if (GIMME_V != G_VOID)
663 { 1065 {
664 wchar_t *wstr = new wchar_t [THIS->ncol]; 1066 wchar_t *wstr = new wchar_t [THIS->ncol];
665 1067
666 for (int col = 0; col <THIS->ncol; col++) 1068 for (int col = 0; col < THIS->ncol; col++)
667 wstr [col] = l.t [col]; 1069 wstr [col] = l.t [col];
668 1070
669 char *str = rxvt_wcstoutf8 (wstr, THIS->ncol); 1071 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
670 free (wstr);
671 1072
672 SV *sv = newSVpv (str, 0); 1073 delete [] wstr;
673 SvUTF8_on (sv);
674 XPUSHs (sv_2mortal (sv));
675 free (str);
676 } 1074 }
677 1075
678 if (new_text) 1076 if (new_text)
679 { 1077 {
680 wchar_t *wstr = sv2wcs (new_text); 1078 wchar_t *wstr = sv2wcs (new_text);
681 1079
682 int len = wcslen (wstr); 1080 int len = min (wcslen (wstr) - start_ofs, max_len);
683 1081
684 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1082 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
685 { 1083 {
686 free (wstr); 1084 free (wstr);
687 croak ("new_text extends beyond horizontal margins"); 1085 croak ("new_text extends beyond horizontal margins");
688 } 1086 }
689 1087
690 for (int col = start_col; col < start_col + len; col++) 1088 for (int col = start_col; col < start_col + len; col++)
691 { 1089 {
692 l.t [col] = wstr [col - start_col]; 1090 l.t [col] = wstr [start_ofs + col - start_col];
693 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col])); 1091 l.r [col] = SET_FONT (l.r [col], THIS->fontset [GET_STYLE (l.r [col])]->find_font (l.t [col]));
694 } 1092 }
695 1093
696 free (wstr); 1094 free (wstr);
697 } 1095 }
698} 1096}
699 1097
700void 1098void
701rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 1099rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
702 PPCODE: 1100 PPCODE:
703{ 1101{
704 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1102 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
705 croak ("row_number number of out range"); 1103 XSRETURN_EMPTY;
706 1104
707 line_t &l = ROW(row_number); 1105 line_t &l = ROW(row_number);
708 1106
709 if (GIMME_V != G_VOID) 1107 if (GIMME_V != G_VOID)
710 { 1108 {
721 { 1119 {
722 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV) 1120 if (!SvROK (new_rend) || SvTYPE (SvRV (new_rend)) != SVt_PVAV)
723 croak ("new_rend must be arrayref"); 1121 croak ("new_rend must be arrayref");
724 1122
725 AV *av = (AV *)SvRV (new_rend); 1123 AV *av = (AV *)SvRV (new_rend);
726 int len = av_len (av) + 1; 1124 int len = min (av_len (av) + 1 - start_ofs, max_len);
727 1125
728 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len)) 1126 if (!IN_RANGE_INC (start_col, 0, THIS->ncol - len))
729 croak ("new_rend array extends beyond horizontal margins"); 1127 croak ("new_rend array extends beyond horizontal margins");
730 1128
731 for (int col = start_col; col < start_col + len; col++) 1129 for (int col = start_col; col < start_col + len; col++)
732 { 1130 {
733 rend_t r = SvIV (*av_fetch (av, col - start_col, 1)) & ~RS_fontMask; 1131 rend_t r = SvIV (*av_fetch (av, start_ofs + col - start_col, 1)) & ~RS_fontMask;
734 1132
735 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col])); 1133 l.r [col] = SET_FONT (r, THIS->fontset [GET_STYLE (r)]->find_font (l.t [col]));
736 } 1134 }
737 } 1135 }
738} 1136}
739 1137
740int 1138int
741rxvt_term::ROW_l (int row_number, int new_length = -2) 1139rxvt_term::ROW_l (int row_number, int new_length = -1)
742 CODE: 1140 CODE:
743{ 1141{
744 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 1142 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
745 croak ("row_number number of out range"); 1143 XSRETURN_EMPTY;
746 1144
747 line_t &l = ROW(row_number); 1145 line_t &l = ROW(row_number);
748 RETVAL = l.l; 1146 RETVAL = l.l;
749 1147
750 if (new_length >= -1) 1148 if (new_length >= 0)
751 l.l = new_length; 1149 l.l = new_length;
752} 1150}
753 OUTPUT: 1151 OUTPUT:
754 RETVAL 1152 RETVAL
755 1153
1154bool
1155rxvt_term::ROW_is_longer (int row_number, int new_is_longer = -1)
1156 CODE:
1157{
1158 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
1159 XSRETURN_EMPTY;
1160
1161 line_t &l = ROW(row_number);
1162 RETVAL = l.is_longer ();
1163
1164 if (new_is_longer >= 0)
1165 l.is_longer (new_is_longer);
1166}
1167 OUTPUT:
1168 RETVAL
1169
756SV * 1170SV *
757rxvt_term::special_encode (SV *str) 1171rxvt_term::special_encode (SV *string)
758 CODE: 1172 CODE:
759 abort ();//TODO 1173{
1174 wchar_t *wstr = sv2wcs (string);
1175 int wlen = wcslen (wstr);
1176 wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
1177
1178 rxvt_push_locale (THIS->locale);
1179
1180 wchar_t *r = rstr;
1181 for (wchar_t *s = wstr; *s; s++)
1182 if (wcwidth (*s) == 0)
1183 {
1184 if (r == rstr)
1185 croak ("leading combining character unencodable");
1186
1187 unicode_t n = rxvt_compose (r[-1], *s);
1188 if (n == NOCHAR)
1189 n = rxvt_composite.compose (r[-1], *s);
1190
1191 r[-1] = n;
1192 }
1193#if !UNICODE_3
1194 else if (*s >= 0x10000)
1195 *r++ = rxvt_composite.compose (*s);
1196#endif
1197 else
1198 *r++ = *s;
1199
1200 rxvt_pop_locale ();
1201
1202 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1203
1204 delete [] rstr;
1205}
1206 OUTPUT:
1207 RETVAL
760 1208
761SV * 1209SV *
762rxvt_term::special_decode (SV *str) 1210rxvt_term::special_decode (SV *text)
763 CODE: 1211 CODE:
764 abort ();//TODO 1212{
1213 wchar_t *wstr = sv2wcs (text);
1214 int wlen = wcslen (wstr);
1215 int dlen = 0;
1216
1217 // find length
1218 for (wchar_t *s = wstr; *s; s++)
1219 if (*s == NOCHAR)
1220 ;
1221 else if (IS_COMPOSE (*s))
1222 dlen += rxvt_composite.expand (*s, 0);
1223 else
1224 dlen++;
1225
1226 wchar_t *rstr = new wchar_t [dlen];
1227
1228 // decode
1229 wchar_t *r = rstr;
1230 for (wchar_t *s = wstr; *s; s++)
1231 if (*s == NOCHAR)
1232 ;
1233 else if (IS_COMPOSE (*s))
1234 r += rxvt_composite.expand (*s, r);
1235 else
1236 *r++ = *s;
1237
1238 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1239
1240 delete [] rstr;
1241}
1242 OUTPUT:
1243 RETVAL
765 1244
766void 1245void
767rxvt_term::_resource (char *name, int index, SV *newval = 0) 1246rxvt_term::_resource (char *name, int index, SV *newval = 0)
768 PPCODE: 1247 PPCODE:
769{ 1248{
770 struct resval { const char *name; int value; } rslist [] = { 1249 struct resval { const char *name; int value; } rslist [] = {
771# define Rs_def(name) { # name, Rs_ ## name }, 1250# define def(name) { # name, Rs_ ## name },
772# define Rs_reserve(name,count) 1251# define reserve(name,count)
773# include "rsinc.h" 1252# include "rsinc.h"
774# undef Rs_def 1253# undef def
775# undef Rs_reserve 1254# undef reserve
776 }; 1255 };
777 1256
778 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1257 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
779 1258
780 do { 1259 do {
786 1265
787 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1266 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
788 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1267 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
789 1268
790 if (GIMME_V != G_VOID) 1269 if (GIMME_V != G_VOID)
791 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1270 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
792 1271
793 if (newval) 1272 if (newval)
794 { 1273 {
795 if (SvOK (newval)) 1274 if (SvOK (newval))
796 { 1275 {
801 else 1280 else
802 THIS->rs [index] = 0; 1281 THIS->rs [index] = 0;
803 } 1282 }
804} 1283}
805 1284
1285const char *
1286rxvt_term::x_resource (const char *name)
1287 CLEANUP:
1288 SvTAINTED_on (ST (0));
1289
1290bool
1291rxvt_term::option (U32 optval, int set = -1)
1292 CODE:
1293{
1294 RETVAL = THIS->options & optval;
1295
1296 if (set >= 0)
1297 {
1298 if (set)
1299 THIS->options |= optval;
1300 else
1301 THIS->options &= ~optval;
1302
1303 switch (optval)
1304 {
1305 case Opt_skipBuiltinGlyphs:
1306 THIS->set_fonts ();
1307 THIS->scr_remap_chars ();
1308 THIS->scr_touch (true);
1309 THIS->want_refresh = 1;
1310 break;
1311
1312 case Opt_cursorUnderline:
1313 THIS->want_refresh = 1;
1314 break;
1315
1316# case Opt_scrollBar_floating:
1317# case Opt_scrollBar_right:
1318# THIS->resize_all_windows (THIS->width, THIS->height, 1);
1319# break;
1320 }
1321 }
1322}
1323 OUTPUT:
1324 RETVAL
1325
1326bool
1327rxvt_term::parse_keysym (char *keysym, char *str)
1328 CODE:
1329 RETVAL = 0 < THIS->parse_keysym (keysym, str);
1330 THIS->keyboard->register_done ();
1331 OUTPUT:
1332 RETVAL
1333
806void 1334void
807rxvt_term::selection_mark (...) 1335rxvt_term::screen_cur (...)
808 PROTOTYPE: $;$$ 1336 PROTOTYPE: $;$$
809 ALIAS: 1337 ALIAS:
1338 screen_cur = 0
810 selection_beg = 1 1339 selection_beg = 1
811 selection_end = 2 1340 selection_end = 2
1341 selection_mark = 3
812 PPCODE: 1342 PPCODE:
813{ 1343{
814 row_col_t &sel = ix == 1 ? THIS->selection.beg 1344 row_col_t &rc = ix == 0 ? THIS->screen.cur
1345 : ix == 1 ? THIS->selection.beg
815 : ix == 2 ? THIS->selection.end 1346 : ix == 2 ? THIS->selection.end
816 : THIS->selection.mark; 1347 : THIS->selection.mark;
817 1348
818 if (GIMME_V != G_VOID) 1349 if (GIMME_V != G_VOID)
819 { 1350 {
820 EXTEND (SP, 2); 1351 EXTEND (SP, 2);
821 PUSHs (sv_2mortal (newSViv (sel.row))); 1352 PUSHs (sv_2mortal (newSViv (rc.row)));
822 PUSHs (sv_2mortal (newSViv (sel.col))); 1353 PUSHs (sv_2mortal (newSViv (rc.col)));
823 } 1354 }
824 1355
825 if (items == 3) 1356 if (items == 3)
826 { 1357 {
827 sel.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1); 1358 rc.row = clamp (SvIV (ST (1)), -THIS->nsaved, THIS->nrow - 1);
828 sel.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1); 1359 rc.col = clamp (SvIV (ST (2)), 0, THIS->ncol - 1);
829 1360
830 if (ix) 1361 if (ix)
831 THIS->want_refresh = 1; 1362 THIS->want_refresh = 1;
832 } 1363 }
833} 1364}
834 1365
1366char
1367rxvt_term::cur_charset ()
1368 CODE:
1369 RETVAL = THIS->charsets [THIS->screen.charset];
1370 OUTPUT:
1371 RETVAL
1372
835int 1373int
836rxvt_term::selection_grab (int eventtime) 1374rxvt_term::selection_grab (U32 eventtime)
837 1375
838void 1376void
839rxvt_term::selection (SV *newtext = 0) 1377rxvt_term::selection (SV *newtext = 0)
840 PPCODE: 1378 PPCODE:
841{ 1379{
842 if (GIMME_V != G_VOID) 1380 if (GIMME_V != G_VOID)
843 { 1381 XPUSHs (THIS->selection.text
844 char *sel = rxvt_wcstoutf8 (THIS->selection.text, THIS->selection.len); 1382 ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
845 SV *sv = newSVpv (sel, 0); 1383 : &PL_sv_undef);
846 SvUTF8_on (sv);
847 free (sel);
848 XPUSHs (sv_2mortal (sv));
849 }
850 1384
851 if (newtext) 1385 if (newtext)
852 { 1386 {
853 free (THIS->selection.text); 1387 free (THIS->selection.text);
854 1388
855 THIS->selection.text = sv2wcs (newtext); 1389 THIS->selection.text = sv2wcs (newtext);
856 THIS->selection.len = wcslen (THIS->selection.text); 1390 THIS->selection.len = wcslen (THIS->selection.text);
857 } 1391 }
858} 1392}
859 1393
1394void
1395rxvt_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)
1396
1397void
1398rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle = RS_RVid)
1399
1400void
1401rxvt_term::scr_bell ()
1402
1403void
1404rxvt_term::scr_add_lines (SV *string)
1405 CODE:
1406{
1407 wchar_t *wstr = sv2wcs (string);
1408 THIS->scr_add_lines (wstr, wcslen (wstr));
1409 free (wstr);
1410}
1411
860void 1412void
861rxvt_term::tt_write (SV *octets) 1413rxvt_term::tt_write (SV *octets)
862 INIT: 1414 INIT:
863 STRLEN len; 1415 STRLEN len;
864 char *str = SvPVbyte (octets, len); 1416 char *str = SvPVbyte (octets, len);
865 C_ARGS: 1417 C_ARGS:
866 (unsigned char *)str, len 1418 str, len
1419
1420void
1421rxvt_term::cmd_parse (SV *octets)
1422 CODE:
1423{
1424 STRLEN len;
1425 char *str = SvPVbyte (octets, len);
1426
1427 char *old_cmdbuf_ptr = THIS->cmdbuf_ptr;
1428 char *old_cmdbuf_endp = THIS->cmdbuf_endp;
1429
1430 THIS->cmdbuf_ptr = str;
1431 THIS->cmdbuf_endp = str + len;
1432
1433 rxvt_push_locale (THIS->locale);
1434 THIS->cmd_parse ();
1435 rxvt_pop_locale ();
1436
1437 THIS->cmdbuf_ptr = old_cmdbuf_ptr;
1438 THIS->cmdbuf_endp = old_cmdbuf_endp;
1439}
867 1440
868SV * 1441SV *
869rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 1442rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
870 CODE: 1443 CODE:
871{ 1444{
872 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 1445 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
873 RETVAL = newSVptr ((void *)o, "urxvt::overlay"); 1446 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
874 o->self = (HV *)SvRV (RETVAL); 1447 o->self = (HV *)SvRV (RETVAL);
875
876 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0));
877 char key[33]; sprintf (key, "%32lx", (long)o);
878 hv_store (hv, key, 32, newSViv ((long)o), 0);
879} 1448}
880 OUTPUT: 1449 OUTPUT:
881 RETVAL 1450 RETVAL
882 1451
883MODULE = urxvt PACKAGE = urxvt::overlay 1452MODULE = urxvt PACKAGE = urxvt::overlay
884 1453
885void 1454void
886overlay::set (int x, int y, SV *text, SV *rend = 0) 1455overlay::set (int x, int y, SV *text, SV *rend = 0)
887 1456
888void 1457void
1458overlay::show ()
1459
1460void
1461overlay::hide ()
1462
1463void
889overlay::DESTROY () 1464overlay::DESTROY ()
890 CODE:
891{
892 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->THIS->self), "_overlay", 8, 0);
893 if (ovs)
894 {
895 HV *hv = (HV *)SvRV (*ovs);
896 char key[33]; sprintf (key, "%32lx", (long)THIS);
897 hv_delete (hv, key, 32, G_DISCARD);
898 }
899
900 delete THIS;
901}
902 1465
903MODULE = urxvt PACKAGE = urxvt::timer 1466MODULE = urxvt PACKAGE = urxvt::timer
904 1467
905SV * 1468SV *
906timer::new () 1469timer::new ()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines