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

Diff Legend

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